zamzam/pos-gis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

penyesuaian

Browse Source
This commit is contained in:
Zamzam Nurzaman 2024-10-08 13:24:47 +07:00
parent 76bf79a6e6
commit 422559e3c5
36 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/RefController.php
View File

@ -468,7 +468,7 @@ class RefController extends Controller
$etcButton .= '<li class="navi-item">
<a onclick="confirm(`'.$param['data']->outlet_id.'`,`'.$param['data']->outlet_nm.'`)" class="navi-link">
<span class="navi-icon"><i class="la la-qrcode"></i></span>
<span class="navi-text">Confirm Outlet</span>
<span class="navi-text">Confirm Agent</span>
</a>
</li>';

2
app/Models/billingModel.php
View File

@ -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"],

4
app/Models/deviceModel.php
View File

@ -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"]
);

4
app/Models/grossModel.php
View File

@ -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"]

4
app/Models/laporanmarketModel.php
View File

@ -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"],

4
app/Models/laporanparkirModel.php
View File

@ -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"],

14
app/Models/merchantModel.php
View File

@ -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;

2
app/Models/orderModel.php
View File

@ -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"],

2
app/Models/paymentModel.php
View File

@ -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"],

2
app/Models/purchaseModel.php
View File

@ -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"],

18
app/Models/tokoModel.php
View File

@ -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"
]);
}
}

2
app/Models/transactionModel.php
View File

@ -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"],

2
app/Models/typeproductModel.php
View File

@ -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"]
);

6
app/Models/useredcModel.php
View File

@ -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':

BIN
public/img/LOGO BANK NTT.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 166 KiB

BIN
public/img/bank_ntt.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 84 KiB

BIN
public/img/gis.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
public/img/logo_half2zzzz.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 389 KiB

BIN
public/img/logo_ntt.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.5 KiB

2
resources/views/auth/login.blade.php
View File

@ -21,7 +21,7 @@
<!--begin::Wrapper-->
<div class="login-content d-flex flex-column pt-lg-0 pt-12" >
<div style="text-align: center;margin-bottom: 70px;">
<div class="text-white" style="font-size: 32px;font-weight: 600;"> BANK</div>
<div class="text-white" style="font-size: 24px;font-weight: 600;text-transform:uppercase;"> <span style="font-weight: 100">global infotech solution</span> POS</div>
<div class="text-white" style="font-size:12px;">"Webmin Electronic Data Capture Point Of Sales"</div>
</div>
<div class="login-form">

4
resources/views/components/master/brand.blade.php
View File

@ -17,10 +17,10 @@
<!--end::Aside Toggle-->
<!--begin::Logo-->
<a href="#">
{{-- <img alt="Logo" src="{{asset('img/basys.png')}}" class="logo-sticky max-h-35px" /> --}}
<img alt="Logo" src="{{asset('img/gis.png')}}" class="logo-sticky max-h-35px" />
</a>
<div class="ml-2" style="display: inline-block;">
<span class="zn-text-logo" style="display: block;color: #004aad;font-weight: 500;">BANK <b style="font-weight: 700;color: #004aad;">POS</b></span>
<span class="zn-text-logo" style="display: block;color: #004aad;font-weight: 500;text-transform:capitalize;">global infotech solution <b style="font-weight: 700;color: #004aad;">POS</b></span>
{{-- <span style="display: block;margin-left: 8px;color: #aaa;font-size: 11px;
font-weight: 400;">"Electronic Data Capture Point Of Sales" </span> --}}
</div>

6
resources/views/components/master/head.blade.php
View File

@ -1,10 +1,10 @@
<title>Bank</title>
<title>global infotech solution - POS</title>
<meta name="csrf-token" content="{{ csrf_token() }}"/>
<meta charset="utf-8">
<meta name="description" content="Bank" />
<meta name="description" content="global infotech solution pos" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
{{-- <link href="{{ asset('img/basys.png') }}" rel="shortcut icon" /> --}}
<link href="{{ asset('img/gis.png') }}" rel="shortcut icon" />
<link href="{{ asset('css/fonts.css') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/plugins/custom/fullcalendar/fullcalendar.bundle.min.css?v=7.0.5') }}" rel="stylesheet" type="text/css" />
<link href="{{ asset('assets/plugins/custom/datatables/datatables.bundle.min.css?v=7.0.5') }}" rel="stylesheet" type="text/css" />

8
resources/views/content/dashboard.blade.php
View File

@ -29,7 +29,7 @@
$ds = \DB::table("merchant")->get();
@endphp
<div class="form-group">
<div class="mb-4">Merchant</div>
<div class="mb-4">Company</div>
<div id="block_merchant">
<select autocomplete="off" onchange="get_dashboard()" class="form-control selectpicker" data-style="btn-warning" name="merchant_filter" id="merchant_filter">
<option selected value="all">Semua</option>
@ -60,7 +60,7 @@
</svg><!--end::Svg Icon--></span>
</div>
<div class="ml-3">
<div class="font-weight-bold font-size-h5 mt-1 text-info"> Merchant </div>
<div class="font-weight-bold font-size-h5 mt-1 text-info"> Company </div>
<div class="font-weight-bold font-size-sm">
<span class="mr-2" style="font-size: 16px;" id="p_outlet"> 0</span>
</div>
@ -317,7 +317,7 @@
<!--end::Body-->
</div>
</div>
<div class="col-md-12">
{{-- <div class="col-md-12">
<div class="card card-custom card-stretch gutter-b scrollStyle"
style="overflow: auto;padding-bottom: 30px;">
<!--begin::Header-->
@ -345,7 +345,7 @@
</div>
<!--end::Body-->
</div>
</div>
</div> --}}
</div>
</div>

2
resources/views/content/dashboard_act.blade.php
View File

@ -35,7 +35,7 @@
},
success: function (res) {
$('#p_outlet').html(znNumFormat(res.data.p_outlet)+' <small class="font-size-sm">Outlet</small>');
$('#p_outlet').html(znNumFormat(res.data.p_outlet)+' <small class="font-size-sm">Agent</small>');
$('#p_order').html(znNumFormat(res.data.p_order)+' <small class="font-size-sm">Order</small>');
$('#p_transaction').html(znNumFormat(res.data.p_transaction)+' <small class="font-size-sm">Transaction</small>');
$('#p_product').html(znNumFormat(res.data.p_product)+' <small class="font-size-sm">Product</small>');

6
resources/views/content/dashboard_pemda.blade.php
View File

@ -35,7 +35,7 @@
})->get();
@endphp
<div class="form-group">
<div class="mb-4">Merchant</div>
<div class="mb-4">Company</div>
<div id="block_merchant">
<select autocomplete="off" onchange="get_dashboard();getOutlet(this.value)" class="form-control select2 znSelect2" style="width: 100%" name="merchant_filter" id="merchant_filter">
<option selected value="all">Semua</option>
@ -55,7 +55,7 @@
<div>
<div class="form-group">
<div class="mb-4">Outlet</div>
<div class="mb-4">Agent</div>
<div id="block_outlet">
<select autocomplete="off" onchange="get_dashboard()" class="form-control select2 znSelect2" style="width: 100%" name="outlet_filter" id="outlet_filter">
@ -88,7 +88,7 @@
</svg><!--end::Svg Icon--></span>
</div>
<div class="ml-3">
<div class="font-weight-bold font-size-h5 mt-1 text-info"> Merchant </div>
<div class="font-weight-bold font-size-h5 mt-1 text-info"> Company </div>
<div class="font-weight-bold font-size-sm">
<span class="mr-2" style="font-size: 16px;" id="p_outlet"> 0</span>
</div>

2
resources/views/content/dashboard_pemda_act.blade.php
View File

@ -41,7 +41,7 @@
},
success: function (res) {
$('#p_outlet').html(znNumFormat(res.data.p_outlet)+' <small class="font-size-sm">Outlet</small>');
$('#p_outlet').html(znNumFormat(res.data.p_outlet)+' <small class="font-size-sm">Agent</small>');
$('#p_order').html(znNumFormat(res.data.p_order)+' <small class="font-size-sm">Order</small>');
$('#p_transaction').html(znNumFormat(res.data.p_transaction)+' <small class="font-size-sm">Transaction</small>');
$('#p_product').html(znNumFormat(res.data.p_product)+' <small class="font-size-sm">Product</small>');

4
resources/views/content/ref/index.blade.php
View File

@ -85,7 +85,7 @@
})->get();
@endphp
<div class="form-group">
<div class="mb-2">Merchant</div>
<div class="mb-2">Company</div>
<div id="block_merchant">
<select autocomplete="off" onchange="getTable()" class="form-control select2 znSelect2" style="width: 100%" name="merchant_filter" id="merchant_filter">
<option selected value="all">Semua</option>
@ -132,7 +132,7 @@
})->get();
@endphp
<div class="form-group">
<div class="mb-2">Merchant</div>
<div class="mb-2">Company</div>
<div id="block_merchant">
<select autocomplete="off" onchange="getTable()" class="form-control select2 znSelect2" style="width: 100%" name="merchant_filter" id="merchant_filter">
<option selected value="all">Semua</option>

8
resources/views/content/ref/merchant/form.blade.php
View File

@ -12,7 +12,7 @@
<div class="separator separator-dashed separator-border-1 mt-5 mb-5"></div>
<div class="row">
<div class="col-md-12">
<x-form.input title="Merchant Name" id="merchant_nm" value="" />
<x-form.input title="Company Name" id="merchant_nm" value="" />
</div>
<div class="col-md-12">
<x-form.textarea title="Address" id="address" value="" />
@ -39,9 +39,9 @@
<x-form.input title="E-Mail" id="email" value="" />
</div> --}}
<div class="col-md-4">
<x-form.input title="Merchant Code" id="mid" value="" />
<x-form.input title="Company Code" id="mid" value="" />
</div>
<div class="col-md-4">
<div class="col-md-4" style="display: none;">
<x-form.select title="Hotel" id="is_hotel">
<x-slot name="option">
<option value="t">Ya</option>
@ -49,7 +49,7 @@
</x-slot>
</x-form.select>
</div>
<div class="col-md-4">
<div class="col-md-4" style="display: none;">
<x-form.select title="Restoran" id="is_resto">
<x-slot name="option">
<option value="t">Ya</option>

4
resources/views/content/ref/toko/action.blade.php
View File

@ -14,8 +14,8 @@ function confirm(id,titleSet) {
clearForm();
$('#mFormConf').modal('show');
znLoadingModal('mFormConf');
$('#mFormConf_title').html(`Confirm Outlet`);
$('#mFormConf_subTitle').html(`Confirm Outlet `+titleSet);
$('#mFormConf_title').html(`Confirm Agent`);
$('#mFormConf_subTitle').html(`Confirm Agent `+titleSet);
let formData = new FormData();
formData.append('id',id);

8
resources/views/content/ref/toko/form.blade.php
View File

@ -41,7 +41,7 @@
$ds = \DB::table("merchant")->get();
@endphp
<div class="form-group">
<div class="mb-2">Merchant</div>
<div class="mb-2">Company</div>
<div id="block_merchant">
<select autocomplete="off" onchange="getTable()" class="form-control select2 znSelect2" style="width: 100%" name="mid" id="mid">
@ -53,10 +53,10 @@
</div>
</div>
<div class="col-md-12">
<x-form.input title="Nama Outlet" id="outlet_nm" value="" />
<x-form.input title="Nama Agent" id="outlet_nm" value="" />
</div>
<div class="col-md-6">
<x-form.input title="Kode outlet" id="outlet_code" value="" />
<x-form.input title="Kode Agent" id="outlet_code" value="" />
</div>
<div class="col-md-6">
<x-form.input title="NMID" id="nmid" value="" />
@ -96,7 +96,7 @@
</x-form.select>
</div>
<div class="col-md-12">
<x-form.select title="Jenis Outlet" id="outlet_type_id">
<x-form.select title="Jenis Agent" id="outlet_type_id">
<x-slot name="option">
<option value=""></option>
@php

2
resources/views/content/ref/useredc/form.blade.php
View File

@ -31,7 +31,7 @@
<x-form.textarea title="Alamat" id="address" value="" />
</div>
<div class="col-md-12">
<x-form.select title="Merchant" id="mid">
<x-form.select title="Company" id="mid">
<x-slot name="option">
{{-- @php
$mer = \DB::table('merchant')->get();

2
resources/views/content/user/form.blade.php
View File

@ -38,7 +38,7 @@
</x-form.select>
<div id="viewMerchant">
<x-form.select title="Merchant" id="mid">
<x-form.select title="Company" id="mid">
<x-slot name="option">
@php
$mer = \DB::table('merchant')->get();

2
resources/views/export/csv_billing.blade.php
View File

@ -3,7 +3,7 @@
@endphp
<table style="width:100%;">
<tr>
<th>Merchant</th>
<th>Company</th>
<th>Time</th>
<th>Staff</th>
<th>Amount</th>

2
resources/views/export/csv_order.blade.php
View File

@ -3,7 +3,7 @@
@endphp
<table style="width:100%;">
<tr>
<th>Merchant</th>
<th>Company</th>
<th>Time</th>
<th>Staff</th>
<th>Order Type</th>

2
resources/views/export/csv_transaction.blade.php
View File

@ -3,7 +3,7 @@
@endphp
<table style="width:100%;">
<tr>
<th>Merchant</th>
<th>Company</th>
<th>Time</th>
<th>Staff</th>
<th>Pay Amount</th>

4
resources/views/export/xlsx_gross.blade.php
View File

@ -47,8 +47,8 @@
<thead>
<tr>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Tanggal</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Merchant</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Outlet</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Company</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Agent</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Gross Sales</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Gross Profit</th>
<th style="border: 1px solid black; font-weight: bold; text-align: center">Trx</th>