nikitakiselev/interview-demo-code
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

wip: deal with totals

Browse Source
This commit is contained in:
Nikita Kiselev
2025-07-23 19:05:48 +03:00
parent 49d41747d3
commit f5cac7d566
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/oc_telegram_shop/upload/catalog/controller/extension/tgshop/handle.php
View File

@@ -264,9 +264,11 @@ class Controllerextensiontgshophandle extends Controller
} }
$data['total_products_count'] = $this->cart->countProducts(); $data['total_products_count'] = $this->cart->countProducts();
$data['total'] = $this->cart->getTotal();
} else { } else {
$data['text_error'] = $this->language->get('text_empty'); $data['text_error'] = $this->language->get('text_empty');
$data['totals'] = []; $data['totals'] = [];
$data['total'] = 0;
$data['products'] = []; $data['products'] = [];
$data['total_products_count'] = 0; $data['total_products_count'] = 0;
unset($this->session->data['success']); unset($this->session->data['success']);

18
spa/src/views/Cart.vue
View File

@@ -77,16 +77,16 @@
</div> </div>
</div> </div>
<div class="fixed px-4 pb-10 pt-4 bottom-0 left-0 w-full bg-base-200 z-50 flex justify-between items-center gap-2 border-t-1 border-t-base-300"> <div class="fixed bottom-0 left-0 w-full px-4 pb-10 pt-4 bg-base-200 z-50 border-t-1 border-t-base-300">
<div> <!-- <div>-->
<div v-if="lastTotal"> <!-- <div v-if="lastTotal">-->
<span class="text-xs text-base-content mr-2">{{ lastTotal.title }}:</span><br> <!-- <span class="text-xs text-base-content mr-2">{{ lastTotal.title }}:</span><br>-->
<span v-if="cart.isLoading" class="loading loading-spinner loading-xs"></span> <!-- <span v-if="cart.isLoading" class="loading loading-spinner loading-xs"></span>-->
<span v-else class="text-accent font-bold">{{ lastTotal.text }}</span> <!-- <span v-else class="text-accent font-bold">{{ lastTotal.text }}</span>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<button class="btn btn-primary" :disabled="cart.canCheckout === false">Перейти к оформлению</button> <button class="btn btn-primary w-full" :disabled="cart.canCheckout === false">Перейти к оформлению</button>
</div> </div>
</div> </div>