From 38c6ccd9c78fbb78544acfcd1097b5e25773b22b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 5 Oct 2022 10:09:10 +0300 Subject: [PATCH] typo --- app/Abstracts/Report.php | 2 +- .../CreateBankingDocumentTransaction.php | 2 +- .../UpdateBankingDocumentTransaction.php | 2 +- app/Jobs/Document/CreateDocumentItem.php | 4 +- .../views/components/modules/item.blade.php | 2 +- .../views/modals/customers/create.blade.php | 38 +++++++++---------- .../views/modals/customers/edit.blade.php | 14 +++---- .../views/modals/vendors/create.blade.php | 12 +++--- resources/views/modals/vendors/edit.blade.php | 14 +++---- .../views/settings/currencies/index.blade.php | 2 +- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index e45e22a71..811d5f7eb 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -171,7 +171,7 @@ abstract class Report $sum += is_array($total) ? array_sum($total) : $total; } - $total = $this->has_money ? money($sum, setting('default.currency'), true)->format() : $sum; + $total = $this->has_money ? money($sum, default_currency(), true)->format() : $sum; } else { $total = trans('general.na'); } diff --git a/app/Jobs/Banking/CreateBankingDocumentTransaction.php b/app/Jobs/Banking/CreateBankingDocumentTransaction.php index f80959aef..711658dec 100644 --- a/app/Jobs/Banking/CreateBankingDocumentTransaction.php +++ b/app/Jobs/Banking/CreateBankingDocumentTransaction.php @@ -67,7 +67,7 @@ class CreateBankingDocumentTransaction extends Job implements ShouldCreate $currency_code = !empty($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; $this->request['company_id'] = $this->model->company_id; - $this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; + $this->request['currency_code'] = $currency_code; $this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString(); $this->request['currency_rate'] = config('money.' . $currency_code . '.rate'); $this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account'); diff --git a/app/Jobs/Banking/UpdateBankingDocumentTransaction.php b/app/Jobs/Banking/UpdateBankingDocumentTransaction.php index da4613240..3f89a92b2 100644 --- a/app/Jobs/Banking/UpdateBankingDocumentTransaction.php +++ b/app/Jobs/Banking/UpdateBankingDocumentTransaction.php @@ -66,7 +66,7 @@ class UpdateBankingDocumentTransaction extends Job implements ShouldUpdate $currency_code = ! empty($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; $this->request['company_id'] = $this->model->company_id; - $this->request['currency_code'] = isset($this->request['currency_code']) ? $this->request['currency_code'] : $this->model->currency_code; + $this->request['currency_code'] = $currency_code; $this->request['paid_at'] = isset($this->request['paid_at']) ? $this->request['paid_at'] : Date::now()->toDateTimeString(); $this->request['currency_rate'] = config('money.' . $currency_code . '.rate'); $this->request['account_id'] = isset($this->request['account_id']) ? $this->request['account_id'] : setting('default.account'); diff --git a/app/Jobs/Document/CreateDocumentItem.php b/app/Jobs/Document/CreateDocumentItem.php index 92710d1f9..5ba45efbf 100644 --- a/app/Jobs/Document/CreateDocumentItem.php +++ b/app/Jobs/Document/CreateDocumentItem.php @@ -28,7 +28,7 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat public function handle(): DocumentItem { - $item_id = !empty($this->request['item_id']) ? $this->request['item_id'] : 0; + $item_id = ! empty($this->request['item_id']) ? $this->request['item_id'] : 0; $precision = config('money.' . $this->document->currency_code . '.precision'); $item_amount = (double) $this->request['price'] * (double) $this->request['quantity']; @@ -36,7 +36,7 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat $item_discounted_amount = $item_amount; // Apply line discount to amount - if (!empty($this->request['discount'])) { + if (! empty($this->request['discount'])) { if ($this->request['discount_type'] === 'percentage') { $item_discounted_amount -= ($item_amount * ($this->request['discount'] / 100)); } else { diff --git a/resources/views/components/modules/item.blade.php b/resources/views/components/modules/item.blade.php index a788b0fae..c11287a3d 100644 --- a/resources/views/components/modules/item.blade.php +++ b/resources/views/components/modules/item.blade.php @@ -63,7 +63,7 @@ {{ trans('modules.free') }} @else - @if (!empty($module->is_discount)) + @if (! empty($module->is_discount)) {!! trans('modules.monthly_price', ['price' => '' . $module->yearly_per_monthly_price . ' ' . $module->yearly_per_monthly_special_price]) !!} @else {!! trans('modules.monthly_price', ['price' => $module->yearly_per_monthly_price]) !!} diff --git a/resources/views/modals/customers/create.blade.php b/resources/views/modals/customers/create.blade.php index 83f528cd0..de1c033d6 100644 --- a/resources/views/modals/customers/create.blade.php +++ b/resources/views/modals/customers/create.blade.php @@ -2,64 +2,64 @@ - {{ trans('general.general') }} - - + {{ trans('general.general') }} + + {{ trans('general.validation_error') }} - + {{ trans('general.address') }} - + {{ trans('general.validation_error') }} - + {{ trans_choice('general.others', 1) }} - + {{ trans('general.validation_error') }} - +
- + - +
-
+ -
+
- + - + - +
- - + +
- + - + diff --git a/resources/views/modals/customers/edit.blade.php b/resources/views/modals/customers/edit.blade.php index e5892cf5d..5e975ca08 100644 --- a/resources/views/modals/customers/edit.blade.php +++ b/resources/views/modals/customers/edit.blade.php @@ -4,7 +4,7 @@ {{ trans('general.general') }} - + {{ trans('general.validation_error') }} @@ -12,7 +12,7 @@ {{ trans('general.address') }} - + {{ trans('general.validation_error') }} @@ -20,7 +20,7 @@ {{ trans_choice('general.others', 1) }} - + {{ trans('general.validation_error') }} @@ -32,19 +32,19 @@ - + - +
-
+
- + diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php index 58f52ee21..1eebbb735 100644 --- a/resources/views/modals/vendors/create.blade.php +++ b/resources/views/modals/vendors/create.blade.php @@ -4,7 +4,7 @@ {{ trans('general.general') }} - + {{ trans('general.validation_error') }} @@ -12,7 +12,7 @@ {{ trans('general.address') }} - + {{ trans('general.validation_error') }} @@ -20,7 +20,7 @@ {{ trans_choice('general.others', 1) }} - + {{ trans('general.validation_error') }} @@ -32,11 +32,11 @@ - + - +
@@ -44,7 +44,7 @@
- + diff --git a/resources/views/modals/vendors/edit.blade.php b/resources/views/modals/vendors/edit.blade.php index 22645dbeb..d1abda31f 100644 --- a/resources/views/modals/vendors/edit.blade.php +++ b/resources/views/modals/vendors/edit.blade.php @@ -4,7 +4,7 @@ {{ trans('general.general') }} - + {{ trans('general.validation_error') }} @@ -12,7 +12,7 @@ {{ trans('general.address') }} - + {{ trans('general.validation_error') }} @@ -20,7 +20,7 @@ {{ trans_choice('general.others', 1) }} - + {{ trans('general.validation_error') }} @@ -32,19 +32,19 @@ - + - +
-
+
- + diff --git a/resources/views/settings/currencies/index.blade.php b/resources/views/settings/currencies/index.blade.php index d284f81f7..92d94b8b4 100644 --- a/resources/views/settings/currencies/index.blade.php +++ b/resources/views/settings/currencies/index.blade.php @@ -66,7 +66,7 @@ @endif - @if ($item->code == setting("default.currency")) + @if ($item->code == default_currency()) @endif