diff --git a/app/Gdoo/Customer/Controllers/CustomerController.php b/app/Gdoo/Customer/Controllers/CustomerController.php index f3646c20..ca7d6de8 100644 --- a/app/Gdoo/Customer/Controllers/CustomerController.php +++ b/app/Gdoo/Customer/Controllers/CustomerController.php @@ -142,7 +142,7 @@ class CustomerController extends DefaultController } $header = Grid::batchEdit([ 'code' => 'customer', - 'columns' => ['region3_id', 'region2_id', 'region_id', 'grade_id', 'type_id', 'class2_id', 'class_id', 'department_id', 'status'], + 'columns' => ['region_id', 'grade_id', 'type_id', 'class2_id', 'class_id', 'department_id', 'status'], ]); return view('batchEdit', [ 'gets' => $gets, diff --git a/app/Gdoo/Stock/Hooks/CancelHook.php b/app/Gdoo/Stock/Hooks/CancelHook.php index 9d2e876b..6f560185 100644 --- a/app/Gdoo/Stock/Hooks/CancelHook.php +++ b/app/Gdoo/Stock/Hooks/CancelHook.php @@ -52,8 +52,6 @@ class CancelHook 'customer_tax.code as customer_code', 'customer.region_id', 'customer_region.owner_user_id as salesman_id', - 'customer.region2_id', - 'customer.region3_id' ]); $sql = "select d.id,d.type_id,d.price,d.quantity,d.money,d.other_money, diff --git a/app/Gdoo/Stock/Hooks/DeliveryHook.php b/app/Gdoo/Stock/Hooks/DeliveryHook.php index 9ef8a066..6417617d 100644 --- a/app/Gdoo/Stock/Hooks/DeliveryHook.php +++ b/app/Gdoo/Stock/Hooks/DeliveryHook.php @@ -57,9 +57,7 @@ class DeliveryHook 'department.code as department_code', 'customer_tax.code as customer_code', 'customer.region_id', - 'customer_region.owner_user_id as salesman_id', - 'customer.region2_id', - 'customer.region3_id' + 'customer_region.owner_user_id as salesman_id' ]); $sql = "select sdd.id,sdd.type_id,sdd.price,sdd.quantity,sdd.money,sdd.other_money, diff --git a/app/Gdoo/Stock/Hooks/DirectHook.php b/app/Gdoo/Stock/Hooks/DirectHook.php index 4036ae12..fda23f87 100644 --- a/app/Gdoo/Stock/Hooks/DirectHook.php +++ b/app/Gdoo/Stock/Hooks/DirectHook.php @@ -63,8 +63,6 @@ class DirectHook 'warehouse.code as warehouse_code', 'customer.region_id', 'customer_region.owner_user_id as salesman_id', - 'customer.region2_id', - 'customer.region3_id' ]); $sql = DB::table('stock_direct_data')