From 3a7ac7efb82a0b863c231fdd8a1b02000fe45108 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 11 Feb 2023 16:37:01 +0800 Subject: [PATCH 01/16] rate history module --- .../History/ListCurrencyRateHistoryLogic.php | 78 ++++++++++ .../Services/Rates/ListsRateLogs.php | 33 +++++ .../History/ListCurrencyRateHistory.php | 20 +++ .../Resources/CurrencyRateLogResource.php | 23 +++ .../forms/ChooseCurrencyComponent.vue | 118 ++++++++++++++++ .../bookings/forms/ChooseServiceComponent.vue | 97 +++++++++++++ .../bookings/forms/RateHistoriesComponent.vue | 133 ++++++++++++++++++ .../views/pages/rate_histories.blade.php | 8 ++ routes/currency.php | 6 +- routes/web.php | 3 + 10 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php create mode 100644 app/Classes/Modules/Currencies/Services/Rates/ListsRateLogs.php create mode 100644 app/Http/Controllers/Currencies/History/ListCurrencyRateHistory.php create mode 100644 app/Http/Resources/CurrencyRateLogResource.php create mode 100644 resources/assets/vue/components/bookings/forms/ChooseCurrencyComponent.vue create mode 100644 resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue create mode 100644 resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue create mode 100644 resources/views/pages/rate_histories.blade.php diff --git a/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php new file mode 100644 index 00000000..f1fb4f10 --- /dev/null +++ b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php @@ -0,0 +1,78 @@ + 'Retrieved Currency Rate History', + 'message' => 'You have successfully retrieved a list of Currency Rate History' + ]; + } + + /** @var CanListRates */ + private $canListRates; + + /** @var ListsRateLogs */ + private $listsRateLogs; + + /** @var FetchesRate */ + private $fetchesRate; + + /** + * ListRatesLogic constructor. + * @param CanListRates $canListRates + * @param ListsRates $listsRates + */ + public function __construct(CanListRates $canListRates, ListsRateLogs $listsRateLogs, FetchesRate $fetchesRate) + { + $this->canListRates = $canListRates; + $this->listsRateLogs = $listsRateLogs; + $this->fetchesRate = $fetchesRate; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request): JsonResponse + { + //$this->canListRates->passes(); + + $filterArray = json_decode($request->input('filters')); + + $rate_filter['currency_id'] = $filterArray->currency_id; + $rate_filter['service_id'] = $filterArray->service_id; + + $currency_rate = $this->fetchesRate->execute( + [ + 'currency_id' => $filterArray->currency_id, + 'service_id' => $filterArray->service_id, + ] + )->first(); + + $query = CurrencyRateLog::where('currency_rate_id', $currency_rate->id)->get(); + + return $this->collectionResponse(CurrencyRateLogResource::collection($query)); + } +} diff --git a/app/Classes/Modules/Currencies/Services/Rates/ListsRateLogs.php b/app/Classes/Modules/Currencies/Services/Rates/ListsRateLogs.php new file mode 100644 index 00000000..d3cfa469 --- /dev/null +++ b/app/Classes/Modules/Currencies/Services/Rates/ListsRateLogs.php @@ -0,0 +1,33 @@ +repository = $repository; + } + + + /** + * @return Builder + */ + function getRepository(): Builder + { + return $this->repository->newQuery(); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Currencies/History/ListCurrencyRateHistory.php b/app/Http/Controllers/Currencies/History/ListCurrencyRateHistory.php new file mode 100644 index 00000000..7e7db955 --- /dev/null +++ b/app/Http/Controllers/Currencies/History/ListCurrencyRateHistory.php @@ -0,0 +1,20 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/app/Http/Resources/CurrencyRateLogResource.php b/app/Http/Resources/CurrencyRateLogResource.php new file mode 100644 index 00000000..436d8359 --- /dev/null +++ b/app/Http/Resources/CurrencyRateLogResource.php @@ -0,0 +1,23 @@ + $this->currency_rate_id, + 'rate' => $this->selling, + 'created_at' => $this->created_at->format('d-m-Y'), + ]; + } +} diff --git a/resources/assets/vue/components/bookings/forms/ChooseCurrencyComponent.vue b/resources/assets/vue/components/bookings/forms/ChooseCurrencyComponent.vue new file mode 100644 index 00000000..e670a450 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/ChooseCurrencyComponent.vue @@ -0,0 +1,118 @@ + + + diff --git a/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue b/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue new file mode 100644 index 00000000..a6d89538 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue @@ -0,0 +1,97 @@ + + + diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue new file mode 100644 index 00000000..90d6bb01 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -0,0 +1,133 @@ + + + diff --git a/resources/views/pages/rate_histories.blade.php b/resources/views/pages/rate_histories.blade.php new file mode 100644 index 00000000..accb0591 --- /dev/null +++ b/resources/views/pages/rate_histories.blade.php @@ -0,0 +1,8 @@ +@extends('layouts.base_portal') +@section('inner_content') +
+
+ +
+
+@endsection diff --git a/routes/currency.php b/routes/currency.php index ba308402..b621aad6 100644 --- a/routes/currency.php +++ b/routes/currency.php @@ -7,4 +7,8 @@ Route::group(['namespace' => 'Currencies', 'as' => 'currency.', 'prefix' => 'cur Route::get('/list', 'ListCurrencyController@list')->name('list'); Route::post('/create', 'CreateCurrencyController@create')->name('create'); Route::delete('/delete/{id}', 'DeleteCurrencyController@delete')->name('delete'); -}); \ No newline at end of file + + Route::group(['prefix' => 'history', 'namespace' => 'History', 'as' => 'history.'], function () { + Route::get('/list', 'ListCurrencyRateHistory@list')->name('list'); + }); +}); diff --git a/routes/web.php b/routes/web.php index 411a0e71..21aec30e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -538,5 +538,8 @@ Route::get('/refund/fix', function(){ }); +Route::get('/currency-rate-history', function () { + return view('pages.rate_histories'); +})->name('currency_rate.history'); From a423ec43cd8049486b70fc6872e756d801b028d8 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 12 Feb 2023 10:40:50 +0800 Subject: [PATCH 02/16] update rate history module --- .../History/ListCurrencyRateHistoryLogic.php | 7 ++++--- app/Http/Resources/CurrencyRateLogResource.php | 3 +++ app/Models/CurrencyRateLog.php | 9 +++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php index f1fb4f10..c36eebf6 100644 --- a/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php +++ b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php @@ -64,14 +64,15 @@ class ListCurrencyRateHistoryLogic extends AbstractControllerLogic $rate_filter['currency_id'] = $filterArray->currency_id; $rate_filter['service_id'] = $filterArray->service_id; - $currency_rate = $this->fetchesRate->execute( + $currency_rate_ids = $this->fetchesRate->execute( [ 'currency_id' => $filterArray->currency_id, 'service_id' => $filterArray->service_id, ] - )->first(); + )->pluck('id')->toArray(); - $query = CurrencyRateLog::where('currency_rate_id', $currency_rate->id)->get(); + // todo: add in date filters + $query = CurrencyRateLog::whereIn('currency_rate_id', $currency_rate_ids)->get(); return $this->collectionResponse(CurrencyRateLogResource::collection($query)); } diff --git a/app/Http/Resources/CurrencyRateLogResource.php b/app/Http/Resources/CurrencyRateLogResource.php index 436d8359..f8560dd8 100644 --- a/app/Http/Resources/CurrencyRateLogResource.php +++ b/app/Http/Resources/CurrencyRateLogResource.php @@ -14,10 +14,13 @@ class CurrencyRateLogResource extends JsonResource */ public function toArray($request) { + $currencyRate = $this->currencyRate; + return [ 'currency_rate_id' => $this->currency_rate_id, 'rate' => $this->selling, 'created_at' => $this->created_at->format('d-m-Y'), + 'payment_method_type' => $currencyRate->payment_method_type, ]; } } diff --git a/app/Models/CurrencyRateLog.php b/app/Models/CurrencyRateLog.php index 38130956..85b0eecf 100644 --- a/app/Models/CurrencyRateLog.php +++ b/app/Models/CurrencyRateLog.php @@ -1,10 +1,19 @@ BelongsTo(CurrencyRate::class, 'currency_rate_id', 'id'); + } } From 81cf90e4c0da7f3959227749023226393104980c Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 12 Feb 2023 19:50:28 +0800 Subject: [PATCH 03/16] update rate history --- .../Eloquent/Filters/CreatedAtBetween.php | 20 ++++++++++++++++ .../Eloquent/Filters/CurrencyRateIdIn.php | 20 ++++++++++++++++ .../History/ListCurrencyRateHistoryLogic.php | 23 +++++++++++-------- .../bookings/forms/ChooseServiceComponent.vue | 6 ++--- .../bookings/forms/RateHistoriesComponent.vue | 17 ++++++++++---- 5 files changed, 69 insertions(+), 17 deletions(-) create mode 100644 app/Classes/General/Eloquent/Filters/CreatedAtBetween.php create mode 100644 app/Classes/General/Eloquent/Filters/CurrencyRateIdIn.php diff --git a/app/Classes/General/Eloquent/Filters/CreatedAtBetween.php b/app/Classes/General/Eloquent/Filters/CreatedAtBetween.php new file mode 100644 index 00000000..4aeebb8c --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/CreatedAtBetween.php @@ -0,0 +1,20 @@ +whereBetween('created_at', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/General/Eloquent/Filters/CurrencyRateIdIn.php b/app/Classes/General/Eloquent/Filters/CurrencyRateIdIn.php new file mode 100644 index 00000000..f80d0855 --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/CurrencyRateIdIn.php @@ -0,0 +1,20 @@ +whereIn('currency_rate_id', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php index c36eebf6..aae7d3aa 100644 --- a/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php +++ b/app/Classes/Modules/Currencies/ControllersLogic/History/ListCurrencyRateHistoryLogic.php @@ -5,14 +5,14 @@ namespace App\Classes\Modules\Currencies\ControllersLogic\History; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Currencies\Services\Rates\ListsRateLogs; -use App\Classes\Modules\Currencies\Services\Rates\FetchesRate; +use App\Classes\Modules\Currencies\Services\Rates\ListsRates; use App\Classes\Modules\Currencies\Standards\Rules\Rates\CanListRates; use App\Http\Resources\CurrencyRateLogResource; -use App\Models\CurrencyRate; use App\Models\CurrencyRateLog; use ErrorException; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Carbon\Carbon; class ListCurrencyRateHistoryLogic extends AbstractControllerLogic { @@ -34,19 +34,19 @@ class ListCurrencyRateHistoryLogic extends AbstractControllerLogic /** @var ListsRateLogs */ private $listsRateLogs; - /** @var FetchesRate */ - private $fetchesRate; + /** @var ListsRate */ + private $listsRates; /** * ListRatesLogic constructor. * @param CanListRates $canListRates * @param ListsRates $listsRates */ - public function __construct(CanListRates $canListRates, ListsRateLogs $listsRateLogs, FetchesRate $fetchesRate) + public function __construct(CanListRates $canListRates, ListsRateLogs $listsRateLogs, listsRates $listsRates) { $this->canListRates = $canListRates; $this->listsRateLogs = $listsRateLogs; - $this->fetchesRate = $fetchesRate; + $this->listsRates = $listsRates; } @@ -64,15 +64,20 @@ class ListCurrencyRateHistoryLogic extends AbstractControllerLogic $rate_filter['currency_id'] = $filterArray->currency_id; $rate_filter['service_id'] = $filterArray->service_id; - $currency_rate_ids = $this->fetchesRate->execute( + $currency_rate_ids = $this->listsRates->execute( [ 'currency_id' => $filterArray->currency_id, 'service_id' => $filterArray->service_id, ] )->pluck('id')->toArray(); - // todo: add in date filters - $query = CurrencyRateLog::whereIn('currency_rate_id', $currency_rate_ids)->get(); + $query = $this->listsRateLogs->execute( + [ + 'currency_rate_id_in' => $currency_rate_ids, + 'date_start' => new Carbon($filterArray->date_from), + 'date_end' => new Carbon($filterArray->date_to), + ] + ); return $this->collectionResponse(CurrencyRateLogResource::collection($query)); } diff --git a/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue b/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue index a6d89538..43d8791e 100644 --- a/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue +++ b/resources/assets/vue/components/bookings/forms/ChooseServiceComponent.vue @@ -1,9 +1,9 @@ From e50a3777fd0f230cd6cdc8233ace96396fcc6c9b Mon Sep 17 00:00:00 2001 From: sharifcse57 Date: Mon, 13 Feb 2023 09:23:54 +0600 Subject: [PATCH 05/16] Fix: loading previous data --- .../vue/components/bookings/forms/RateHistoriesComponent.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue index 54b8e721..bc24b896 100644 --- a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -142,6 +142,8 @@ export default { }, watch: { rateHistory: function(newVal) { + this.chartLebels = []; + this.chartData = []; for (var i = 0; i < newVal.length; i++) { this.chartLebels.push(newVal[i].created_at.split("-")[0]); this.chartData.push(newVal[i]["rate"]); From 940e20a780a728499595e731b3db8c763aeed472 Mon Sep 17 00:00:00 2001 From: Cleison Freitas Date: Tue, 14 Feb 2023 23:20:35 -0300 Subject: [PATCH 06/16] Endpoint to change the name and debtor from company --- .../UpdateCompanyNameAndDebtorLogic.php | 83 +++++++++++++++++++ .../DataTransferObjects/CompanyObject.php | 2 +- .../Companies/Services/UpdatesCompany.php | 4 +- .../Services/UpdatesCompanyDebtor.php | 4 +- .../UpdateCompanyNameAndDebtorController.php | 21 +++++ app/Http/Resources/CompanyResource.php | 1 + routes/company.php | 1 + 7 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php create mode 100644 app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php new file mode 100644 index 00000000..c47c3e0c --- /dev/null +++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php @@ -0,0 +1,83 @@ + 'Update Company Account Status', + 'message' => 'You have successfully updated the Company Account Status' + ]; + } + /** @var CanUpdateCompany */ + private $canUpdateCompany; + + /** @var UpdatesCompany */ + private $updatesCompany; + + /** @var FetchesCompany */ + private $fetchesCompany; + + /** @var UpdatesCompanyDebtor */ + private $updatesCompanyDebtor; + + /** + * UpdateCompanyControllersLogic constructor. + * @param CanUpdateCompany $canUpdateCompany + * @param UpdatesCompany $updatesCompany + * @param FetchesCompany $fetchesCompany + * @param UpdatesCompanyDebtor $updatesCompanyDebtor + */ + public function __construct( + CanUpdateCompany $canUpdateCompany, + UpdatesCompany $updatesCompany, + FetchesCompany $fetchesCompany, + UpdatesCompanyDebtor $updatesCompanyDebtor + ) + { + $this->canUpdateCompany = $canUpdateCompany; + $this->updatesCompany = $updatesCompany; + $this->fetchesCompany = $fetchesCompany; + $this->updatesCompanyDebtor = $updatesCompanyDebtor; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + $query = $this->fetchesCompany->execute(['id' => $request->route('id')]); + + $object = new CompanyObject($request->input('name'), $request->input('reference'),$query->business_type, $request->input('type')); + + $this->canUpdateCompany->passes($object); + + $query = $this->updatesCompany->execute($query, $object); + + if ($request->input('debtor') || $query->first()->debtor !== null) { + $this->updatesCompanyDebtor->execute($query, $request->input('debtor')); + } + + return $this->resourceResponse(new CompanyResource($query)); + } + +} + diff --git a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php index 09b0e153..cbc5df53 100644 --- a/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php +++ b/app/Classes/Modules/Companies/DataTransferObjects/CompanyObject.php @@ -83,4 +83,4 @@ class CompanyObject implements DataTransferObject -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompany.php b/app/Classes/Modules/Companies/Services/UpdatesCompany.php index f89bbca8..1b92c2d8 100644 --- a/app/Classes/Modules/Companies/Services/UpdatesCompany.php +++ b/app/Classes/Modules/Companies/Services/UpdatesCompany.php @@ -15,7 +15,7 @@ class UpdatesCompany extends AbstractUpdateRecord * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(Company $model, CompanyObject $object) + public function execute(Company $model, CompanyObject $object) { $model->name = $object->getName(); $model->reference = $object->getReference(); @@ -23,4 +23,4 @@ class UpdatesCompany extends AbstractUpdateRecord return $this->handler($model); } -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php index 4cb43a9f..14e0d6e2 100644 --- a/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php +++ b/app/Classes/Modules/Companies/Services/UpdatesCompanyDebtor.php @@ -11,6 +11,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord /** * @param Company $model + * @param CompanyObject $object * @param string $debtor * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException @@ -18,6 +19,7 @@ class UpdatesCompanyDebtor extends AbstractUpdateRecord public function execute(Company $model, string $debtor) { $model->debtor = $debtor; + return $this->handler($model); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php b/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php new file mode 100644 index 00000000..0168e059 --- /dev/null +++ b/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php @@ -0,0 +1,21 @@ +input('debtor'));die; + return $logic->execute($request); + } +} diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index cb357684..6d7cb2e4 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -37,6 +37,7 @@ class CompanyResource extends JsonResource 'id' => $this->id, 'name' => $this->name, 'reference' => $this->reference, + 'debtor' => $this->debtor, 'type' => (int) $this->type, 'business_type' => (int) $this->business_type, 'status' => (int) $this->status, diff --git a/routes/company.php b/routes/company.php index cb1b059c..6571daa4 100644 --- a/routes/company.php +++ b/routes/company.php @@ -9,6 +9,7 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update'); Route::put('update/{id}/status', 'UpdateCompanyStatusController@update')->name('status.update'); Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete'); + Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor'); Route::put('/update/debtor/{id}', 'UpdateCompanyDebtorController@update')->name('delete'); From 2c9ce36a225efc05e95bb0869665637033d4e4f1 Mon Sep 17 00:00:00 2001 From: Cleison Freitas Date: Tue, 14 Feb 2023 23:42:20 -0300 Subject: [PATCH 07/16] Building the company responsible for changing the name and debtor from company --- .../elements/CustomerProfileComponent.vue | 6 +- .../forms/ChangeCustomerNameFormComponent.vue | 73 +++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index fd36e8a2..1b7fe979 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -5,6 +5,7 @@ width="50" height="50" viewBox="0 0 172 172" style=" fill:#000000;"> + >
@@ -13,6 +14,9 @@
+ + +
{{item.name}}
@@ -93,4 +97,4 @@ export default { mixins: [componentHandler] } - \ No newline at end of file + diff --git a/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue b/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue new file mode 100644 index 00000000..d956b443 --- /dev/null +++ b/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue @@ -0,0 +1,73 @@ + + From dda0b28f6c256709621f85cde3af34fa52facda8 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 16 Feb 2023 20:03:19 +0800 Subject: [PATCH 08/16] update company name and debtor code --- .../UpdateCompanyNameAndDebtorLogic.php | 3 +-- .../Companies/UpdateCompanyNameAndDebtorController.php | 6 ++---- .../companies/elements/CustomerProfileComponent.vue | 10 +++++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php index c47c3e0c..05fb0746 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameAndDebtorLogic.php @@ -3,7 +3,6 @@ namespace App\Classes\Modules\Companies\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject; -use App\Classes\Modules\Companies\DataTransferObjects\CompanyObjectDebtor; use App\Classes\Modules\Companies\Services\FetchesCompany; use App\Classes\Modules\Companies\Services\UpdatesCompany; use App\Classes\Modules\Companies\Services\UpdatesCompanyDebtor; @@ -66,7 +65,7 @@ class UpdateCompanyNameAndDebtorLogic extends AbstractControllerLogic { $query = $this->fetchesCompany->execute(['id' => $request->route('id')]); - $object = new CompanyObject($request->input('name'), $request->input('reference'),$query->business_type, $request->input('type')); + $object = new CompanyObject($request->input('name'), $request->input('reference'), $query->business_type, $request->input('type')); $this->canUpdateCompany->passes($object); diff --git a/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php b/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php index 0168e059..18599e7f 100644 --- a/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php +++ b/app/Http/Controllers/Companies/UpdateCompanyNameAndDebtorController.php @@ -2,8 +2,7 @@ namespace App\Http\Controllers\Companies; -use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyLogic; -use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameAndDebtorLogic as CompanyNameDebtorLogic; +use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameAndDebtorLogic; use App\Http\Controllers\Controller; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -13,9 +12,8 @@ class UpdateCompanyNameAndDebtorController extends Controller /** * @param Request $request */ - public function update(Request $request, CompanyNameDebtorLogic $logic) : JsonResponse + public function update(Request $request, UpdateCompanyNameAndDebtorLogic $logic) : JsonResponse { - //echo json_encode($request->input('debtor'));die; return $logic->execute($request); } } diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue index 1b7fe979..8217fbbe 100644 --- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue +++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue @@ -5,19 +5,23 @@ width="50" height="50" viewBox="0 0 172 172" style=" fill:#000000;"> - >
-
+
-
{{item.name}}
+
+ {{item.name}} +
+ +
+
From f9a371cdf04ed663aaaf4abda41813d6ec769c93 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 16 Feb 2023 23:06:31 +0800 Subject: [PATCH 09/16] update company name debtor --- .../companies/forms/ChangeCustomerNameFormComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue b/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue index d956b443..92e85846 100644 --- a/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue +++ b/resources/assets/vue/components/companies/forms/ChangeCustomerNameFormComponent.vue @@ -53,7 +53,7 @@ parameters: { name: { required, - minLength: minLength(8) + // minLength: minLength(8) }, debtor: { }, From f55822344a7801ccba3dd7ea60ee49bc1f5dbb83 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 16 Feb 2023 23:20:36 +0800 Subject: [PATCH 10/16] code review --- .../components/bookings/forms/RateHistoriesComponent.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue index bc24b896..b55d39c9 100644 --- a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -29,10 +29,8 @@
-
-
- -
+
+
From 1f461a750ff16321b76f0d311f37c1ebd4cb9e93 Mon Sep 17 00:00:00 2001 From: sharifcse57 Date: Fri, 17 Feb 2023 14:25:18 +0600 Subject: [PATCH 11/16] working with plotting the rate history group by payment type --- .../bookings/forms/RateHistoriesComponent.vue | 80 +++++++++++++++---- .../views/pages/rate_histories.blade.php | 2 +- routes/web.php | 28 ++++--- 3 files changed, 80 insertions(+), 30 deletions(-) diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue index b55d39c9..f0721f83 100644 --- a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -29,8 +29,8 @@
-
- +
+
@@ -81,14 +81,32 @@ export default { date_from: null, }, chartLebels:[], - chartData: [] + chartData: [], + paymentMethodsConst: [], + colors: [ + 'red', + 'green', + 'blue', + 'yellow' + ] }; }, + props:{ + paymentMethods: { + type: Object + } + }, computed: { pendingQueue() { return this.$store.getters.isInCompleteQueue(this.section); } }, + mounted(){ + this.paymentMethodsConst = Object.entries(this.paymentMethods).reduce((acc, [key, value]) => { + acc[value] = key; + return acc; + }, {}); + }, watch: { pendingQueue(inComplete) { if (inComplete) { @@ -140,25 +158,55 @@ export default { }, watch: { rateHistory: function(newVal) { - this.chartLebels = []; - this.chartData = []; - for (var i = 0; i < newVal.length; i++) { - this.chartLebels.push(newVal[i].created_at.split("-")[0]); - this.chartData.push(newVal[i]["rate"]); + // Set current month and year + const date = new Date(); + const currentMonth = date.getMonth() + 1; + const currentYear = date.getFullYear(); + + // Group rates by payment method type + const ratesByType = {}; + newVal.forEach(rate => { + if (!ratesByType[rate.payment_method_type]) { + ratesByType[rate.payment_method_type] = []; } + ratesByType[rate.payment_method_type].push(rate); + }); + + // Get rates for current month + const ratesForMonth = {}; + Object.keys(ratesByType).forEach(type => { + ratesForMonth[type] = []; + for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { + const dateStr = `${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`; + const rate = ratesByType[type].find(r => r.created_at === dateStr); + ratesForMonth[type].push(rate ? rate.rate : ''); + } + }); + + // Generate labels for chart + const labels = []; + for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { + labels.push(`${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`); + } + + // Generate datasets for chart + const datasets = []; + Object.keys(ratesForMonth).forEach(type => { + datasets.push({ + label: `${this.paymentMethodsConst[type]}`, + data: ratesForMonth[type], + borderColor: `#${Math.floor(Math.random()*16777215).toString(16)}`, + fill: false + }); + }); + setTimeout(() => { const ctx = document.getElementById("currency-history-chart"); new Chart(ctx, { type: 'line', data: { - labels: this.chartLebels, - datasets: [{ - label: 'Currency Rate History', - data: this.chartData, - fill: false, - borderColor: 'rgb(75, 192, 192)', - tension: 0.1 - }] + labels: labels, + datasets: datasets }, }); }, 300); diff --git a/resources/views/pages/rate_histories.blade.php b/resources/views/pages/rate_histories.blade.php index accb0591..4d19ef10 100644 --- a/resources/views/pages/rate_histories.blade.php +++ b/resources/views/pages/rate_histories.blade.php @@ -2,7 +2,7 @@ @section('inner_content')
- +
@endsection diff --git a/routes/web.php b/routes/web.php index 35ad7015..053c500e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,26 +1,27 @@ with('paymentMethods', $paymentMethods); })->name('currency_rate.history'); From 08526296c6557f72a1342e8917a1a9c56f9c8763 Mon Sep 17 00:00:00 2001 From: sharifcse57 Date: Fri, 17 Feb 2023 14:32:04 +0600 Subject: [PATCH 12/16] working with plotting the rate history group by payment type --- .../bookings/forms/RateHistoriesComponent.vue | 116 +++++++++--------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue index f0721f83..18845a78 100644 --- a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -85,9 +85,10 @@ export default { paymentMethodsConst: [], colors: [ 'red', - 'green', + 'pink', 'blue', - 'yellow' + 'yellow', + 'black' ] }; }, @@ -112,6 +113,61 @@ export default { if (inComplete) { this.resetSarch(); } + }, + rateHistory: function(newVal) { + // Set current month and year + const date = new Date(); + const currentMonth = date.getMonth() + 1; + const currentYear = date.getFullYear(); + + // Group rates by payment method type + const ratesByType = {}; + newVal.forEach(rate => { + if (!ratesByType[rate.payment_method_type]) { + ratesByType[rate.payment_method_type] = []; + } + ratesByType[rate.payment_method_type].push(rate); + }); + + // Get rates for current month + const ratesForMonth = {}; + Object.keys(ratesByType).forEach(type => { + ratesForMonth[type] = []; + for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { + const dateStr = `${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`; + const rate = ratesByType[type].find(r => r.created_at === dateStr); + console.log(dateStr); + ratesForMonth[type].push(rate ? rate.rate : ''); + } + }); + + // Generate labels for chart + const labels = []; + for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { + labels.push(`${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`); + } + + // Generate datasets for chart + const datasets = []; + Object.keys(ratesForMonth).forEach(type => { + datasets.push({ + label: `${this.paymentMethodsConst[type]}`, + data: ratesForMonth[type], + borderColor: this.colors[type], + fill: false + }); + }); + + setTimeout(() => { + const ctx = document.getElementById("currency-history-chart"); + new Chart(ctx, { + type: 'line', + data: { + labels: labels, + datasets: datasets + }, + }); + }, 300); } }, created() { @@ -156,61 +212,5 @@ export default { // this.error = error.message; } }, - watch: { - rateHistory: function(newVal) { - // Set current month and year - const date = new Date(); - const currentMonth = date.getMonth() + 1; - const currentYear = date.getFullYear(); - - // Group rates by payment method type - const ratesByType = {}; - newVal.forEach(rate => { - if (!ratesByType[rate.payment_method_type]) { - ratesByType[rate.payment_method_type] = []; - } - ratesByType[rate.payment_method_type].push(rate); - }); - - // Get rates for current month - const ratesForMonth = {}; - Object.keys(ratesByType).forEach(type => { - ratesForMonth[type] = []; - for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { - const dateStr = `${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`; - const rate = ratesByType[type].find(r => r.created_at === dateStr); - ratesForMonth[type].push(rate ? rate.rate : ''); - } - }); - - // Generate labels for chart - const labels = []; - for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { - labels.push(`${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`); - } - - // Generate datasets for chart - const datasets = []; - Object.keys(ratesForMonth).forEach(type => { - datasets.push({ - label: `${this.paymentMethodsConst[type]}`, - data: ratesForMonth[type], - borderColor: `#${Math.floor(Math.random()*16777215).toString(16)}`, - fill: false - }); - }); - - setTimeout(() => { - const ctx = document.getElementById("currency-history-chart"); - new Chart(ctx, { - type: 'line', - data: { - labels: labels, - datasets: datasets - }, - }); - }, 300); - } - }, } From 209df3f3f7ab6186285367d56ecaa16f62e3e234 Mon Sep 17 00:00:00 2001 From: sharifcse57 Date: Fri, 17 Feb 2023 20:29:36 +0600 Subject: [PATCH 13/16] Fix: Date range data show in chart --- .../bookings/forms/RateHistoriesComponent.vue | 80 +++++++++++++------ 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue index 18845a78..290d18ba 100644 --- a/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue +++ b/resources/assets/vue/components/bookings/forms/RateHistoriesComponent.vue @@ -87,8 +87,9 @@ export default { 'red', 'pink', 'blue', - 'yellow', - 'black' + 'purple', + 'black', + 'yellow' ] }; }, @@ -115,10 +116,18 @@ export default { } }, rateHistory: function(newVal) { - // Set current month and year - const date = new Date(); - const currentMonth = date.getMonth() + 1; - const currentYear = date.getFullYear(); + + const date_from_parts = this.filters.date_from.split("-"); + const date_from_year = date_from_parts[2]; + const date_from_month = date_from_parts[1] - 1; // Subtract 1 from month, since it's zero-based in Date objects + const date_from_day = date_from_parts[0]; + const start = new Date(date_from_year, date_from_month, date_from_day); + + const date_to_parts = this.filters.date_to.split("-"); + const date_to_year = date_to_parts[2]; + const date_to_month = date_to_parts[1] - 1; // Subtract 1 from month, since it's zero-based in Date objects + const date_to_day = date_to_parts[0]; + const end = new Date(date_to_year, date_to_month, date_to_day); // Group rates by payment method type const ratesByType = {}; @@ -126,36 +135,59 @@ export default { if (!ratesByType[rate.payment_method_type]) { ratesByType[rate.payment_method_type] = []; } - ratesByType[rate.payment_method_type].push(rate); + ratesByType[rate.payment_method_type].push(rate); }); - // Get rates for current month - const ratesForMonth = {}; + const startYear = start.getFullYear(); + const startMonth = start.getMonth() + 1; + const endYear = end.getFullYear(); + const endMonth = end.getMonth() + 1; + + // Get rates for date range + const ratesForRange = {}; Object.keys(ratesByType).forEach(type => { - ratesForMonth[type] = []; - for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { - const dateStr = `${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`; + ratesForRange[type] = []; + for (let i = start.getDate(); i <= end.getDate(); i++) { + const dateStr = `${i.toString().padStart(2, '0')}-${startMonth.toString().padStart(2, '0')}-${startYear}`; + if (i === end.getDate() && startMonth !== endMonth) { + // Handle end month + const endMonthDays = new Date(endYear, endMonth, 0).getDate(); + for (let j = 1; j <= end.getDate(); j++) { + const dateStr = `${j.toString().padStart(2, '0')}-${endMonth.toString().padStart(2, '0')}-${endYear}`; + const rate = ratesByType[type].find(r => r.created_at === dateStr); + ratesForRange[type].push(rate ? rate.rate : ''); + } + } else { + // Handle start month and other months in range const rate = ratesByType[type].find(r => r.created_at === dateStr); - console.log(dateStr); - ratesForMonth[type].push(rate ? rate.rate : ''); + ratesForRange[type].push(rate ? rate.rate : ''); + } } }); - // Generate labels for chart const labels = []; - for (let i = 1; i <= new Date(currentYear, currentMonth, 0).getDate(); i++) { - labels.push(`${i.toString().padStart(2, '0')}-${currentMonth.toString().padStart(2, '0')}-${currentYear}`); + for (let i = start.getDate(); i <= end.getDate(); i++) { + if (i === end.getDate() && startMonth !== endMonth) { + // Handle end month + const endMonthDays = new Date(endYear, endMonth, 0).getDate(); + for (let j = 1; j <= end.getDate(); j++) { + labels.push(`${j.toString().padStart(2, '0')}-${endMonth.toString().padStart(2, '0')}-${endYear}`); + } + } else { + // Handle start month and other months in range + labels.push(`${i.toString().padStart(2, '0')}-${startMonth.toString().padStart(2, '0')}-${startYear}`); + } } // Generate datasets for chart const datasets = []; - Object.keys(ratesForMonth).forEach(type => { - datasets.push({ - label: `${this.paymentMethodsConst[type]}`, - data: ratesForMonth[type], - borderColor: this.colors[type], - fill: false - }); + Object.keys(ratesForRange).forEach(type => { + datasets.push({ + label: `${this.paymentMethodsConst[type]}`, + data: ratesForRange[type], + borderColor: this.colors[type], + fill: false + }); }); setTimeout(() => { From 0c21e6bd91dd349f7c9a7800e5f24b3dddc3044c Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 22 Feb 2023 10:47:28 +0800 Subject: [PATCH 14/16] delete 1688 po --- .../DeletePurchaseOrderPdfLogic.php | 75 +++++++++++++++++++ .../DeletePurchaseOrderPdfController.php | 16 ++++ .../bookings/forms/DeletePoFormComponent.vue | 33 ++++++++ .../BookingDetailsSectionComponent.vue | 9 +++ routes/booking.php | 1 + 5 files changed, 134 insertions(+) create mode 100644 app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php create mode 100644 app/Http/Controllers/Bookings/DeletePurchaseOrderPdfController.php create mode 100644 resources/assets/vue/components/bookings/forms/DeletePoFormComponent.vue diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php new file mode 100644 index 00000000..a4dd30a1 --- /dev/null +++ b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php @@ -0,0 +1,75 @@ + 'Purchase Order PDF Deleted', + 'message' => 'You have successfully deleted the Purchase order PDF' + ]; + } + + /** @var FetchesBooking */ + private $fetchesBooking; + + /** @var DeletesDocument */ + private $deletesDocument; + + /** @var CanDeleteDocument */ + private $canDeleteDocument; + + + /** + * DeletePurchaseOrderPdfLogic constructor. + * @param FetchesBooking $fetchesBooking + * @param DeletesDocument $deletesDocument + * @param CanDeleteDocument $canDeleteDocument + */ + public function __construct(fetchesBooking $fetchesBooking, DeletesDocument $deletesDocument, CanDeleteDocument $canDeleteDocument) + { + $this->fetchesBooking = $fetchesBooking; + $this->deletesDocument = $deletesDocument; + $this->canDeleteDocument = $canDeleteDocument; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function logic(Request $request) : JsonResponse + { + + $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]); + + $document = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first(); + + $this->canDeleteDocument->passes(); + + $this->deletesDocument->execute($document); + + // todo: delete purchaseOrderFor1688 + // if(in_array($booking->company->id, [199, 510])){ + // $this->createPurchaseOrderFor1688OrderProcessor->execute($booking); + // } + + return $this->response([]); + } + +} diff --git a/app/Http/Controllers/Bookings/DeletePurchaseOrderPdfController.php b/app/Http/Controllers/Bookings/DeletePurchaseOrderPdfController.php new file mode 100644 index 00000000..0113c0d5 --- /dev/null +++ b/app/Http/Controllers/Bookings/DeletePurchaseOrderPdfController.php @@ -0,0 +1,16 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/resources/assets/vue/components/bookings/forms/DeletePoFormComponent.vue b/resources/assets/vue/components/bookings/forms/DeletePoFormComponent.vue new file mode 100644 index 00000000..b8701f85 --- /dev/null +++ b/resources/assets/vue/components/bookings/forms/DeletePoFormComponent.vue @@ -0,0 +1,33 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue index fe2826e4..073d7741 100644 --- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue @@ -261,6 +261,15 @@
+ +
+
+
Delete PO
+
+ + + +
diff --git a/routes/booking.php b/routes/booking.php index b645345c..81db27b6 100644 --- a/routes/booking.php +++ b/routes/booking.php @@ -28,6 +28,7 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval'); Route::post('{id}/purchase_order/pdf', 'UploadPurchaseOrderController@upload')->name('po.pdf'); + Route::delete('{id}/purchase_order/pdf', 'DeletePurchaseOrderPdfController@delete')->name('po.pdf.delete'); Route::put('{id}/updateAmount', 'UpdateBookingAmountController@update')->name('booking_amount.update'); From aa84279e831d95a0f1f54bd74709fa475eb15c7b Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 22 Feb 2023 11:35:50 +0800 Subject: [PATCH 15/16] delete 1688 po --- .../bookings/sections/BookingDetailsSectionComponent.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue index 073d7741..1bf92781 100644 --- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue @@ -261,8 +261,7 @@
- -
+
Delete PO
From bf3d1d0c23622926cb0905a912b25fe33b849f7f Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 22 Feb 2023 16:25:30 +0800 Subject: [PATCH 16/16] remove text --- .../ControllersLogic/DeletePurchaseOrderPdfLogic.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php index a4dd30a1..5bc44d34 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php @@ -55,7 +55,6 @@ class DeletePurchaseOrderPdfLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]); $document = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first(); @@ -64,11 +63,6 @@ class DeletePurchaseOrderPdfLogic extends AbstractControllerLogic $this->deletesDocument->execute($document); - // todo: delete purchaseOrderFor1688 - // if(in_array($booking->company->id, [199, 510])){ - // $this->createPurchaseOrderFor1688OrderProcessor->execute($booking); - // } - return $this->response([]); }