[PROMOTE] 晉升 dev 變更至 demo 環境
1. [FIX] 修正商品管理分頁排序不唯一導致的重複商品與漏資料問題。
This commit is contained in:
commit
e42aec1354
@ -54,7 +54,7 @@ class ProductController extends Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$products = $productQuery->latest()->paginate($per_page, ['*'], 'product_page')->withQueryString();
|
$products = $productQuery->orderBy('created_at', 'desc')->orderBy('id', 'desc')->paginate($per_page, ['*'], 'product_page')->withQueryString();
|
||||||
|
|
||||||
// Categories Query
|
// Categories Query
|
||||||
$categoryQuery = ProductCategory::with(['translations', 'company']);
|
$categoryQuery = ProductCategory::with(['translations', 'company']);
|
||||||
@ -70,7 +70,7 @@ class ProductController extends Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$categories = $categoryQuery->latest()->paginate($per_page, ['*'], 'category_page')->withQueryString();
|
$categories = $categoryQuery->orderBy('created_at', 'desc')->orderBy('id', 'desc')->paginate($per_page, ['*'], 'category_page')->withQueryString();
|
||||||
$companies = $user->isSystemAdmin() ? Company::all() : collect();
|
$companies = $user->isSystemAdmin() ? Company::all() : collect();
|
||||||
|
|
||||||
// Settings for Modal (use current user company or fallback)
|
// Settings for Modal (use current user company or fallback)
|
||||||
@ -140,7 +140,7 @@ class ProductController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$logs = $logQuery->latest()->paginate($per_page, ['*'], 'log_page')->withQueryString();
|
$logs = $logQuery->orderBy('created_at', 'desc')->orderBy('id', 'desc')->paginate($per_page, ['*'], 'log_page')->withQueryString();
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
'success' => true,
|
'success' => true,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user