cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'qr-api-issue' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal

Browse Source
This commit is contained in:
edmondlang
2024-04-10 22:27:29 +08:00
parent 5f5bbe0c8c 924f4f2ace
commit 5f529965da
6 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/qr.php
+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=',
];
resources/assets/vue/app.js
Vendored
+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);
resources/assets/vue/components/orders/elements/OrderComponent.vue
+2 -1
View File
@@ -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>
resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
+2 -1
View File
@@ -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>
resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue
+2 -1
View File
@@ -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>
resources/views/pdfs/qr.blade.php
+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">