Compare commits
3 Commits
20250806-1
...
20250806-2
| Author | SHA1 | Date | |
|---|---|---|---|
| 44a500df9f | |||
| 1a962ecb39 | |||
| 24a911d63a |
@@ -91,6 +91,6 @@ class UserSite extends Model
|
||||
*/
|
||||
public function getUserDefaultInfoByUserId(int $userId)
|
||||
{
|
||||
return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_NO_DEFAULT)->first();
|
||||
return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_DEFAULT)->first();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ class FinancesService extends BaseService
|
||||
->when($searchKitchenId, function ($query) use ($searchKitchenId) {
|
||||
$query->where('kitchen_id', $searchKitchenId);
|
||||
})
|
||||
->groupBy('cycle_id')
|
||||
->groupBy('cycle_id','date')
|
||||
->orderByDesc('cycle_id')
|
||||
->select(
|
||||
'date',
|
||||
|
||||
@@ -160,7 +160,7 @@ class OrderInfoService extends BaseService
|
||||
$boxNum = 0;
|
||||
if (!empty($pickupCodeOneCopies)) {
|
||||
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
|
||||
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
|
||||
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? 0 / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
|
||||
}
|
||||
|
||||
$oneCopiesInfo = [
|
||||
|
||||
@@ -184,7 +184,7 @@ class OrderListService extends BaseService
|
||||
$boxNum = 0;
|
||||
if (!empty($pickupCodeOneCopies)) {
|
||||
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
|
||||
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
|
||||
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? 0 / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
|
||||
}
|
||||
$oneCopiesInfo = [
|
||||
'total_price' => '0.00',
|
||||
|
||||
Reference in New Issue
Block a user