From dcb556edcf0433ec2a732d62ac46f7c58804a34d Mon Sep 17 00:00:00 2001 From: A1Gard Date: Mon, 25 Nov 2024 17:47:38 +0330 Subject: [PATCH 1/3] fix invoice bug --- resources/views/admin/invoices/invoice-form.blade.php | 7 ++++--- .../segments/invoice/LianaInvoice/LianaInvoice.blade.php | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/views/admin/invoices/invoice-form.blade.php b/resources/views/admin/invoices/invoice-form.blade.php index b21cdaa..3467c18 100644 --- a/resources/views/admin/invoices/invoice-form.blade.php +++ b/resources/views/admin/invoices/invoice-form.blade.php @@ -189,9 +189,10 @@ - @else @foreach($order->quantity->meta as $m) - - {{$m->human_value}} - +
+ {{$m['label']}}: + {!! $m['human_value']??'-' !!} +
@endforeach @endif diff --git a/resources/views/segments/invoice/LianaInvoice/LianaInvoice.blade.php b/resources/views/segments/invoice/LianaInvoice/LianaInvoice.blade.php index 10da18a..af735fa 100644 --- a/resources/views/segments/invoice/LianaInvoice/LianaInvoice.blade.php +++ b/resources/views/segments/invoice/LianaInvoice/LianaInvoice.blade.php @@ -68,8 +68,8 @@ - @else @foreach($order->quantity->meta as $m) - - {{$m->human_value}} + + {!! $m['human_value']??'-' !!} @endforeach @endif From 4a75c66267397d5d68a6aa3ea65a0aa8f9032121 Mon Sep 17 00:00:00 2001 From: A1Gard Date: Mon, 25 Nov 2024 17:51:41 +0330 Subject: [PATCH 2/3] fixed add to card bug for yasamin theme part --- resources/js/client-vue/QuantitiesAddToCard.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/client-vue/QuantitiesAddToCard.vue b/resources/js/client-vue/QuantitiesAddToCard.vue index 4d8ba32..db8cbda 100644 --- a/resources/js/client-vue/QuantitiesAddToCard.vue +++ b/resources/js/client-vue/QuantitiesAddToCard.vue @@ -102,9 +102,9 @@ export default { select(i) { document.querySelector('#price').innerText = commafy(this.qz[i].price.toString()) + ' ' + this.currency; let index = this.qz[i].image; + this.selected = i; document.querySelector('#preview a').setAttribute('href', document.querySelector(`#hidden-images a:nth-child(${index + 1})`).getAttribute('href')); document.querySelector('#preview img').setAttribute('src', document.querySelector(`#hidden-images a:nth-child(${index + 1}) img`).getAttribute('src')); - this.selected = i; }, async add2card() { if (this.selected == null) { From 5aa1d513c55768c8c0f05a863109e69ffb14e683 Mon Sep 17 00:00:00 2001 From: A1Gard Date: Mon, 25 Nov 2024 17:58:03 +0330 Subject: [PATCH 3/3] fixed add card removed test code --- app/Http/Controllers/CardController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/CardController.php b/app/Http/Controllers/CardController.php index 057e29f..345ce92 100644 --- a/app/Http/Controllers/CardController.php +++ b/app/Http/Controllers/CardController.php @@ -82,7 +82,7 @@ class CardController extends Controller public function index() { - auth('customer')->login(Customer::first()); +// auth('customer')->login(Customer::first()); $area = 'card'; $title = __("Shopping card"); $subtitle = '';