|
|
@@ -135,13 +135,13 @@ sql;
|
|
|
if (array_key_exists($key, $tmpArray)) {
|
|
|
if (is_array($tmpArray[$key]['locationid'])) {
|
|
|
if (count($tmpArray[$key]['locationid'])<5){
|
|
|
- $tmpArray[$key]['locationid'][] = $row->locationid;
|
|
|
+ $tmpArray[$key]['locationid'][] = ['location'=>$row->locationid,'qty'=>$row->qty];
|
|
|
}
|
|
|
} else {
|
|
|
- $tmpArray[$key]['locationid'] = array($tmpArray[$key]['locationid'], $row->locationid);
|
|
|
+ $tmpArray[$key]['locationid'] = array($tmpArray[$key]['locationid'], ['location'=>$row->locationid,'qty'=>$row->qty]);
|
|
|
}
|
|
|
} else {
|
|
|
- $tmpArray[$key] = array('sku'=>$row->sku,'locationid'=>array($row->locationid));
|
|
|
+ $tmpArray[$key] = array('sku'=>$row->sku,'locationid'=>array(['location'=>$row->locationid,'qty'=>$row->qty]));
|
|
|
}
|
|
|
}
|
|
|
return $tmpArray;
|