diff --git a/app/Http/Controllers/RefController.php b/app/Http/Controllers/RefController.php index 95f8999..bb8dbcc 100644 --- a/app/Http/Controllers/RefController.php +++ b/app/Http/Controllers/RefController.php @@ -468,7 +468,7 @@ class RefController extends Controller $etcButton .= '
  • - Confirm Outlet + Confirm Agent
    • '; diff --git a/app/Models/billingModel.php b/app/Models/billingModel.php index fd7d7c9..8c80524 100644 --- a/app/Models/billingModel.php +++ b/app/Models/billingModel.php @@ -27,7 +27,7 @@ class billingModel extends Model $data['actButton'] = []; $data['tableHead'] = array( - ["Merchant","all","merchant_nm"], + ["Company","all","merchant_nm"], ["Time","all","crtdt"], ["Staff","all","user_nm"], ["Amount","all","bill_amount"], diff --git a/app/Models/deviceModel.php b/app/Models/deviceModel.php index 1502bf1..b9c2854 100644 --- a/app/Models/deviceModel.php +++ b/app/Models/deviceModel.php @@ -34,8 +34,8 @@ class deviceModel extends Model ["Brand","all","name_brand"], ["Model","all","model"], ["Terminal ID","all","tid"], - ["Merchant Name","all","merchant_nm"], - ["Outlet Name","all","outlet_nm"], + ["Company Name","all","merchant_nm"], + ["Agent Name","all","outlet_nm"], ["Act","all","action"] ); diff --git a/app/Models/grossModel.php b/app/Models/grossModel.php index 4cf937c..b7eed26 100644 --- a/app/Models/grossModel.php +++ b/app/Models/grossModel.php @@ -28,8 +28,8 @@ class grossModel extends Model $data['tableHead'] = array( ["Tanggal","all","crtdt"], - ["Merchant","all","merchant_nm"], - ["Outlet","all","outlet_nm"], + ["Company","all","merchant_nm"], + ["Agent","all","outlet_nm"], ["Gross Sales","all","gross_sales"], ["Gross Profit","all","gross_profit"], ["Trx","all","count_trx"] diff --git a/app/Models/laporanmarketModel.php b/app/Models/laporanmarketModel.php index 6561c06..de3dd43 100644 --- a/app/Models/laporanmarketModel.php +++ b/app/Models/laporanmarketModel.php @@ -27,8 +27,8 @@ class laporanmarketModel extends Model $data['tableHead'] = array( ["Transaction Time","all","transaction_time"], - ["Merchant ID","all","mid"], - ["Merchant Name","all","merchant_nm"], + ["Company ID","all","mid"], + ["Company Name","all","merchant_nm"], ["Toko","all","toko_nm"], ["Toko Code","all","toko_kd"], ["Keterangan","all","keterangan"], diff --git a/app/Models/laporanparkirModel.php b/app/Models/laporanparkirModel.php index 8e9dfeb..52a967a 100644 --- a/app/Models/laporanparkirModel.php +++ b/app/Models/laporanparkirModel.php @@ -27,8 +27,8 @@ class laporanparkirModel extends Model $data['tableHead'] = array( ["Transaction Time","all","transaction_time"], - ["Merchant ID","all","mid"], - ["Merchant Name","all","merchant_nm"], + ["Company ID","all","mid"], + ["Company Name","all","merchant_nm"], ["Amount","all","amount"], ["Vehicle","all","vehicle_type_nm"], ["Plat No","all","plat_no"], diff --git a/app/Models/merchantModel.php b/app/Models/merchantModel.php index 722645c..7510d3c 100644 --- a/app/Models/merchantModel.php +++ b/app/Models/merchantModel.php @@ -25,19 +25,19 @@ class merchantModel extends Model public function initData($request,$route) { // INIT DB - $data['title'] = 'Merchant'; + $data['title'] = 'Company'; $data['actButton'] = ['edit']; $data['tableHead'] = array( // ["Logo","all","logo"], - ["Merchant Code","all","mid"], - ["Merchant Name","all","merchant_nm"], + ["Company Code","all","mid"], + ["Company Name","all","merchant_nm"], ["Address","all","address"], ["Phone","all","phone_no"], ["Tax","all","tax_list"], - ["Hotel","all","is_hotel"], - ["Restoran","all","is_resto"], + // ["Hotel","all","is_hotel"], + // ["Restoran","all","is_resto"], // ["Act","all","action"] ); @@ -138,7 +138,7 @@ class merchantModel extends Model try{ $cGlobal = new Controller(); - $titleTrail = 'Merchant'; + $titleTrail = 'Company'; switch ($act) { case 'storeMerchant': @@ -260,7 +260,7 @@ class merchantModel extends Model DB::table('merchant_tax')->insert($datas); - $cGlobal->auditTrailValue("Merchant Tax",$titleTrail,'merchant_tax',json_encode($datas),''); + $cGlobal->auditTrailValue("Company Tax",$titleTrail,'merchant_tax',json_encode($datas),''); } } break; diff --git a/app/Models/orderModel.php b/app/Models/orderModel.php index 3a78424..bdbc5a1 100644 --- a/app/Models/orderModel.php +++ b/app/Models/orderModel.php @@ -26,7 +26,7 @@ class orderModel extends Model $data['actButton'] = []; $data['tableHead'] = array( - ["Merchant","all","merchant_nm"], + ["Company","all","merchant_nm"], ["Time","all","crtdt"], ["Staff","all","user_nm"], ["Order Type","all","order_type_nm"], diff --git a/app/Models/paymentModel.php b/app/Models/paymentModel.php index c94b31d..3b5a279 100644 --- a/app/Models/paymentModel.php +++ b/app/Models/paymentModel.php @@ -27,7 +27,7 @@ class paymentModel extends Model $data['tableHead'] = array( ["Payment Time","all","transaction_time"], - ["Merchant ID","all","mid"], + ["Company ID","all","mid"], ["Amount","all","amount"], ["Fee","all","fee"], ["Account No","all","account_number"], diff --git a/app/Models/purchaseModel.php b/app/Models/purchaseModel.php index 81af8a7..72a0967 100644 --- a/app/Models/purchaseModel.php +++ b/app/Models/purchaseModel.php @@ -27,7 +27,7 @@ class purchaseModel extends Model $data['tableHead'] = array( ["Purchase Time","all","transaction_time"], - ["Merchant ID","all","mid"], + ["Company ID","all","mid"], ["Amount","all","amount"], ["Fee","all","fee"], ["Account No","all","account_number"], diff --git a/app/Models/tokoModel.php b/app/Models/tokoModel.php index 9777969..9a8cd0f 100644 --- a/app/Models/tokoModel.php +++ b/app/Models/tokoModel.php @@ -23,13 +23,13 @@ class tokoModel extends Model public function initData($request,$route) { // INIT DB - $data['title'] = 'Outlet'; + $data['title'] = 'Agent'; $data['actButton'] = ['edit']; $data['tableHead'] = array( - ["Merchant Name","all","merchant_nm"], - ["Nama outlet","all","outlet_nm"], - ["Kode outlet","all","outlet_code"], + ["Company Name","all","merchant_nm"], + ["Nama Agent","all","outlet_nm"], + ["Kode Agent","all","outlet_code"], ["Jenis","all","outlet_type_nm"], ["Alamat","all","address"], ["Kota","all","city_nm"], @@ -126,7 +126,7 @@ class tokoModel extends Model try{ $cGlobal = new Controller(); - $titleTrail = 'Outlet'; + $titleTrail = 'Agent'; switch ($act) { case 'storeToko': @@ -143,14 +143,14 @@ class tokoModel extends Model if ($checkCode > 0) { return response()->json([ 'rc' => 99, - 'rm' => "Kode Outlet ".$request->outlet_code." Sudah Terdaftar" + 'rm' => "Kode Agent ".$request->outlet_code." Sudah Terdaftar" ]); } if ($checkNameOutlet > 0) { return response()->json([ 'rc' => 99, - 'rm' => "Nama Outlet ".$request->outlet_nm." Sudah Terdaftar" + 'rm' => "Nama Agent ".$request->outlet_nm." Sudah Terdaftar" ]); } @@ -167,7 +167,7 @@ class tokoModel extends Model if ($validNMID == false) { return response()->json([ 'rc' => 99, - 'rm' => "Kode Outlet ".$request->outlet_code." Sudah Terdaftar" + 'rm' => "Kode Agent ".$request->outlet_code." Sudah Terdaftar" ]); } } @@ -181,7 +181,7 @@ class tokoModel extends Model if ($validName == false) { return response()->json([ 'rc' => 99, - 'rm' => "Nama Outlet ".$request->outlet_nm." Sudah Terdaftar" + 'rm' => "Nama Agent ".$request->outlet_nm." Sudah Terdaftar" ]); } } diff --git a/app/Models/transactionModel.php b/app/Models/transactionModel.php index 0fb0cf0..f19b40b 100644 --- a/app/Models/transactionModel.php +++ b/app/Models/transactionModel.php @@ -27,7 +27,7 @@ class transactionModel extends Model $data['actButton'] = []; $data['tableHead'] = array( - ["Merchant","all","merchant_nm"], + ["Company","all","merchant_nm"], ["Time","all","crtdt"], ["Staff","all","user_nm"], ["Pay Amount","all","pay_amount"], diff --git a/app/Models/typeproductModel.php b/app/Models/typeproductModel.php index 86cf2e4..ad000a0 100644 --- a/app/Models/typeproductModel.php +++ b/app/Models/typeproductModel.php @@ -26,7 +26,7 @@ class typeproductModel extends Model $data['tableHead'] = array( ["Type Name","all","product_type_nm"], - ["POS Type","all","pos_type"], + // ["POS Type","all","pos_type"], ["Act","all","action"] ); diff --git a/app/Models/useredcModel.php b/app/Models/useredcModel.php index b567c27..c3f7adf 100644 --- a/app/Models/useredcModel.php +++ b/app/Models/useredcModel.php @@ -23,11 +23,11 @@ class useredcModel extends Model public function initData($request,$route) { // INIT DB - $data['title'] = 'User Merchant '; + $data['title'] = 'User Company '; $data['actButton'] = ['edit']; $data['tableHead'] = array( - ["Merchant","all","merchant_nm"], + ["Company","all","merchant_nm"], ["Username","all","username"], ["Nama User","all","user_nm"], ["No HP","all","phone_no"], @@ -83,7 +83,7 @@ class useredcModel extends Model try{ $cGlobal = new Controller(); - $titleTrail = 'User Merchant'; + $titleTrail = 'User Company'; switch ($act) { case 'storeUser': diff --git a/public/img/LOGO BANK NTT.png b/public/img/LOGO BANK NTT.png deleted file mode 100644 index e0d9956..0000000 Binary files a/public/img/LOGO BANK NTT.png and /dev/null differ diff --git a/public/img/bank_ntt.png b/public/img/bank_ntt.png deleted file mode 100644 index eb48ee6..0000000 Binary files a/public/img/bank_ntt.png and /dev/null differ diff --git a/public/img/gis.png b/public/img/gis.png new file mode 100644 index 0000000..faceff7 Binary files /dev/null and b/public/img/gis.png differ diff --git a/public/img/logo_half2zzzz.png b/public/img/logo_half2zzzz.png deleted file mode 100644 index f0f07b2..0000000 Binary files a/public/img/logo_half2zzzz.png and /dev/null differ diff --git a/public/img/logo_ntt.png b/public/img/logo_ntt.png deleted file mode 100644 index 9f8f0fe..0000000 Binary files a/public/img/logo_ntt.png and /dev/null differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 87b0207..7cbb50c 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -21,7 +21,7 @@
    -
    BANK
    +
    global infotech solution POS
    "Webmin Electronic Data Capture Point Of Sales"
    diff --git a/resources/views/components/master/brand.blade.php b/resources/views/components/master/brand.blade.php index f27c7dd..15858f7 100644 --- a/resources/views/components/master/brand.blade.php +++ b/resources/views/components/master/brand.blade.php @@ -17,10 +17,10 @@ - {{-- Logo --}} + Logo
    - + {{-- "Electronic Data Capture Point Of Sales" --}}
    diff --git a/resources/views/components/master/head.blade.php b/resources/views/components/master/head.blade.php index e6d33cb..93af9af 100644 --- a/resources/views/components/master/head.blade.php +++ b/resources/views/components/master/head.blade.php @@ -1,10 +1,10 @@ -Bank +global infotech solution - POS - + -{{-- --}} + diff --git a/resources/views/content/dashboard.blade.php b/resources/views/content/dashboard.blade.php index 0449c3f..3b810f5 100644 --- a/resources/views/content/dashboard.blade.php +++ b/resources/views/content/dashboard.blade.php @@ -29,7 +29,7 @@ $ds = \DB::table("merchant")->get(); @endphp
    -
    Merchant
    +
    Company
    @@ -55,7 +55,7 @@
    -
    Outlet
    +
    Agent
    @@ -132,7 +132,7 @@ })->get(); @endphp
    -
    Merchant
    +
    Company
    @@ -53,10 +53,10 @@
    - +
    - +
    @@ -96,7 +96,7 @@
    - + @php diff --git a/resources/views/content/ref/useredc/form.blade.php b/resources/views/content/ref/useredc/form.blade.php index 28f427a..aeec43c 100644 --- a/resources/views/content/ref/useredc/form.blade.php +++ b/resources/views/content/ref/useredc/form.blade.php @@ -31,7 +31,7 @@
    - + {{-- @php $mer = \DB::table('merchant')->get(); diff --git a/resources/views/content/user/form.blade.php b/resources/views/content/user/form.blade.php index 2ee2c30..e5e857e 100644 --- a/resources/views/content/user/form.blade.php +++ b/resources/views/content/user/form.blade.php @@ -38,7 +38,7 @@
    - + @php $mer = \DB::table('merchant')->get(); diff --git a/resources/views/export/csv_billing.blade.php b/resources/views/export/csv_billing.blade.php index e6de6df..879a81e 100644 --- a/resources/views/export/csv_billing.blade.php +++ b/resources/views/export/csv_billing.blade.php @@ -3,7 +3,7 @@ @endphp - + diff --git a/resources/views/export/csv_order.blade.php b/resources/views/export/csv_order.blade.php index b474822..ca1ab08 100644 --- a/resources/views/export/csv_order.blade.php +++ b/resources/views/export/csv_order.blade.php @@ -3,7 +3,7 @@ @endphp
    MerchantCompany Time Staff Amount
    - + diff --git a/resources/views/export/csv_transaction.blade.php b/resources/views/export/csv_transaction.blade.php index 1e1b134..8851c24 100644 --- a/resources/views/export/csv_transaction.blade.php +++ b/resources/views/export/csv_transaction.blade.php @@ -3,7 +3,7 @@ @endphp
    MerchantCompany Time Staff Order Type
    - + diff --git a/resources/views/export/xlsx_gross.blade.php b/resources/views/export/xlsx_gross.blade.php index b69a906..c2215ac 100644 --- a/resources/views/export/xlsx_gross.blade.php +++ b/resources/views/export/xlsx_gross.blade.php @@ -47,8 +47,8 @@ - - + +
    MerchantCompany Time Staff Pay Amount
    TanggalMerchantOutletCompanyAgent Gross Sales Gross Profit Trx