diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php index 6e16350e0..0c0a200cb 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php @@ -11,12 +11,13 @@ class AdvsImport implements ToModel, WithHeadingRow { public function model(array $row) { + $row['name'] = $row['name'] ?? $row['title']; if ($row['name'] !== null && $row['price'] !== null && $row['currency'] !== null) { return new AdvModel([ 'name' => $row['name'], 'slug' => Str::slug($row['name']), 'advs_desc' => $row['description'] ?? null, - 'standard_price' => $row['standard_price'] ?? null, + 'standard_price' => $row['standard_price'] ?? 0, 'price' => $row['price'], 'currency' => $row['currency'], 'country' => $row['country'] ?? null, diff --git a/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php b/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php index 14332d921..f85eb02df 100644 --- a/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php +++ b/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php @@ -16,9 +16,11 @@ class AddTotalSales public function handle(CreatedOrderDetail $event) { $item = $event->getOrderItem(); - $adv = $this->advModel->find($event->getOrderItem()->item_id); - $total = $adv->total_sales + $item->piece; - $adv->total_sales = $total; - $adv->save(); + if ($item->item_type === 'adv') { + $adv = $this->advModel->find($event->getOrderItem()->item_id); + $total = $adv->total_sales + $item->piece; + $adv->total_sales = $total; + $adv->save(); + } } -} \ No newline at end of file +} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig index 8d05f6bd1..ca3751215 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig @@ -1,6 +1,8 @@ {% extends "theme::layouts/default" %} {% block styles %} + + {{ asset_style('visiosoft.theme.base::css/login.css') }} {% endblock %} @@ -103,4 +105,4 @@ {{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }} -{% endblock %} \ No newline at end of file +{% endblock %}