Compare commits

...

8 Commits

Author SHA1 Message Date
edmondlang 924f4f2ace fix qr api issue 2024-04-10 22:27:09 +08:00
edmondlang 6369282b38 update qr code config 2024-04-10 18:22:11 +08:00
jiasheng224 1991cf2c57 fix qr api issue 2024-04-09 17:42:10 +08:00
Omair Saleh e5347f56b7 change bank in details 2024-04-04 08:22:47 +08:00
Omair Saleh 6673a44137 fix invoice date for april 2024-04-03 12:22:32 +08:00
Omair Saleh 4d3345f613 Merge remote-tracking branch 'origin/master' 2024-04-03 12:17:54 +08:00
Omair Saleh 60b8657773 fix invoice date for april 2024-04-03 12:17:40 +08:00
edmondlang 9f7a8d0d4b hide deletePaidGroupTransaction 2024-03-31 23:12:38 +08:00
12 changed files with 32 additions and 11 deletions
@@ -5,8 +5,10 @@ namespace App\Classes\Modules\Transactions\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\PackingList;
use App\Models\Transaction;
use Carbon\Carbon;
class CreatesTransaction extends AbstractUpdateRelationshipRecord
{
@@ -33,6 +35,11 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
$model->expires_on = $object->getExpiresOn();
$model->status = $object->getStatus();
if((int)$object->getTransactionType() === TransactionType::SHIPPING_INVOICE){
$model->created_at = Carbon::now()->subDays(10);
$model->updated_at = Carbon::now()->subDays(10);
}
return $this->handler($packing_list->transactions(), $model);
}
}
}
+8
View File
@@ -0,0 +1,8 @@
<?php
return [
// please update resources/assets/vue/app.js if value is changed
// 'qr_code_img_url' => 'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl=', // not working
'qr_code_img_url' => 'https://qrcode.tec-it.com/API/QRCode?data=',
];
+3
View File
@@ -24,6 +24,9 @@ import closable from './general/directives/closable';
import Avatar from 'vue-avatar';
// define global variable
Vue.prototype.$qr_code_img_url = 'https://qrcode.tec-it.com/API/QRCode?data=';
/** Application Injections */
Vue.use(vuelidate);
Vue.use(VueTheMask);
@@ -7,7 +7,8 @@
<div class="col">
<a :href="route('order.qr.download', item.id)" target="_blank">
<div class="peelable-corner overflow-hidden relative">
<img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+item.id+'}'" class="w-100">
<!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+item.id+'}'" class="w-100"> -->
<img :src="this.$qr_code_img_url + item.id + '}'" class="w-100">
</div>
</a>
</div>
@@ -12,7 +12,8 @@
<div class="col-10">
<a :href="route('order.qr.download', order.id)" target="_blank">
<div class="peelable-corner overflow-hidden relative">
<img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
<!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100"> -->
<img :src="this.$qr_code_img_url + order.id + '}'" class="w-100">
</div>
</a>
</div>
@@ -12,7 +12,8 @@
<div class="col-10">
<a :href="route('order.qr.download', order.id)" target="_blank">
<div class="peelable-corner overflow-hidden relative">
<img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100">
<!-- <img :src="'https://chart.googleapis.com/chart?chs=150x150&cht=qr&chl={id:'+order.id+'}'" class="w-100"> -->
<img :src="this.$qr_code_img_url + order.id + '}'" class="w-100">
</div>
</a>
</div>
@@ -75,11 +75,11 @@
<i class="fa fa-repeat fs-20 text-white"></i>
</div>
</div>
<div class="col-auto requestModal" v-if="item.status == 2 && $store.getters.isSuperAdmin" data-type="deletePaidGroupTransaction">
<!-- <div class="col-auto requestModal" v-if="item.status == 2 && $store.getters.isSuperAdmin && false" data-type="deletePaidGroupTransaction">
<div class="btn bg-grey no-border">
<i class="fa fa-times"></i>
</div>
</div>
</div> -->
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deletePaidGroupTransaction">
<general-confirmation-form-component
contentText="Are you sure you want to delete this Paid Group Payment?"
@@ -80,7 +80,7 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
</div>
</div>
<div class="row">
@@ -81,7 +81,7 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
</div>
</div>
<div class="row">
@@ -115,7 +115,7 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
</div>
</div>
<div class="row">
@@ -76,7 +76,7 @@
</div>
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">562237009234</span></div>
<div class="font-heading all-caps fs-10 bold">Maybank: <span class="text-complete">568603010762</span></div>
</div>
</div>
<div class="row">
+1 -1
View File
@@ -16,7 +16,7 @@
<tbody>
<tr align="center">
<td>
<img src="{{ url('https://chart.googleapis.com/chart?chs=250x250&cht=qr&chl={"id":'.$order->id.'}') }}" style="width: 230px; height: 230px;" />
<img src="{{ url(config('qr.qr_code_img_url') . '{id:'.$order->id.'}') }}" style="width: 230px; height: 230px;" />
</td>
</tr>
<tr align="center">