fix resolve conflict

This commit is contained in:
Hafifie PKB
2023-12-12 13:07:37 +08:00
7 changed files with 1717 additions and 7 deletions
@@ -62,6 +62,11 @@ class CustomersController extends Controller
$customer_page = ($cawangan_info['version'] == 'v1') ? 'customers.v1.info' : 'customers.v2.info';
if($request->tebus_auto_tawarruq_berjaya === 'true'){
$request->session()->flash('activate_tab', 'SAG_baru');
}
return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
}