diff --git a/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php b/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php index 6fb2051d..82670fb2 100644 --- a/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php @@ -69,7 +69,7 @@ class SuccessUpdatePaymentStatusV2CommandJob implements ShouldQueue $packingList->save(); if(app()->environment('production')){ - (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList); + //(App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList); (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList); } diff --git a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php index 83ce0057..72741936 100644 --- a/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php +++ b/app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php @@ -68,7 +68,7 @@ class ApproveChangeOrderAddressProcessor $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; if($appointee === 2) { foreach($address->owner->packingLists()->where('type', PackingListType::SHIPPING_PACKING_LIST) as $packingList){ - $this->updateDoFromVTPortalProcessor->execute($packingList); + //$this->updateDoFromVTPortalProcessor->execute($packingList); } } diff --git a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php index 306866aa..dc0116c1 100644 --- a/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php +++ b/app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php @@ -77,7 +77,7 @@ class UpdatePackingListStatusLogic extends AbstractControllerLogic // $appointee = $address->owner->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_FREIGHT_FORWARDER)->first()->appointee->id; - $this->updateDoFromVTPortalProcessor->execute($packingList); + // $this->updateDoFromVTPortalProcessor->execute($packingList); $this->updateDoFromYDPortalProcessor->execute($packingList); return $this->resourceResponse(new PackingListResource($packingList)); diff --git a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionOneTimeFixProcessor.php b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionOneTimeFixProcessor.php index 3d648e76..ec73b5c1 100644 --- a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionOneTimeFixProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionOneTimeFixProcessor.php @@ -144,7 +144,7 @@ class CreatePaymentTransactionOneTimeFixProcessor $packingList->save(); if(app()->environment('production')){ - $this->updateDoFromVTPortalProcessor->execute($packingList); + //$this->updateDoFromVTPortalProcessor->execute($packingList); $this->updateDoFromYDPortalProcessor->execute($packingList); } } diff --git a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php index 2b9c5e46..61043cca 100644 --- a/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php @@ -135,7 +135,7 @@ class CreatePaymentTransactionProcessor $packingList->save(); if(app()->environment('production')){ - $this->updateDoFromVTPortalProcessor->execute($packingList); + //$this->updateDoFromVTPortalProcessor->execute($packingList); $this->updateDoFromYDPortalProcessor->execute($packingList); } } diff --git a/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php b/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php index 3d23f50d..ccd05a5b 100644 --- a/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php @@ -93,7 +93,7 @@ class ReleaseGoodsToCustomerProcessor $packingList->save(); if (app()->environment('production')) { - $this->updateDoFromVTPortalProcessor->execute($packingList); + // $this->updateDoFromVTPortalProcessor->execute($packingList); $this->updateDoFromYDPortalProcessor->execute($packingList); } diff --git a/app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php b/app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php index 078cb171..0421c3f8 100644 --- a/app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php +++ b/app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php @@ -76,10 +76,10 @@ class SuccessUpdatePaymentStatusButFailedCallback extends Command */ public function handle() { - ini_set('memory_limit', '-1'); + ini_set('memory_limit', '-1'); $this->info(Carbon::now() . ' : Billplz Failled Callback cron started.'); - $this->outputArray = []; + $this->outputArray = []; $start = new Carbon(); $approvalStatusArray = ApprovalStatus::APPROVAL_STATUS_ID; @@ -107,27 +107,27 @@ class SuccessUpdatePaymentStatusButFailedCallback extends Command $this->info('PackingList has no owner. PackingList ID: ' . $packingList->id); continue; } - + if ($invoice->status == ApprovalStatus::APPROVED) { $totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount'); - + if(($invoice->amount - $totalPaidAmount) < 0.01) { $this->updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED); - + $packingList->status = ApprovalStatus::APPROVED; $packingList->save(); - + if(app()->environment('production')){ - $this->updateDoFromVTPortalProcessor->execute($packingList); + //$this->updateDoFromVTPortalProcessor->execute($packingList); $this->updateDoFromYDPortalProcessor->execute($packingList); } - + dump('Updated invoice ' . $invoice->id . '. Order: '. $order->reference); } else { $this->info('Failed Update invoice ' . $invoice->id . ' because payment not enough. Invoice Amount: ' . $invoice->amount . ' . Paid Amount: ' . $totalPaidAmount . ' . Order: '. $order->reference); } - } + } } $end = new Carbon(); diff --git a/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue index 79eb616c..aecd8b4a 100644 --- a/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue @@ -172,7 +172,7 @@ import { useVuelidate } from '@vuelidate/core'; import { required, email, numeric, sameAs, requiredIf } from '@vuelidate/validators'; import { useAuthStore } from '@/stores/auth'; import { useUiStore } from '@/stores/ui'; -import { useRequest } from '@/composables/useRequest'; +import { useModalFormHandler } from '@/composables/useModalFormHandler'; import route from '@/general/functions/router'; import ErrorMessageComponent from '@/components/general/elements/ErrorMessageComponent.vue'; import ValidationWrapperComponent from '@/components/general/forms/ValidationWrapperComponent.vue'; @@ -181,7 +181,7 @@ const props = defineProps<{ section: string; }>(); -const { submit } = useRequest(); +const { submit } = useModalFormHandler(props); const authStore = useAuthStore(); const uiStore = useUiStore(); @@ -266,9 +266,6 @@ const submitForm = async () => { access_token: response.payload.access_token, redirect_url: response.payload.redirect_url }); - }, - errorHandler: (response: any) => { - error.value = response.message; } } ); diff --git a/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue index 9ef2f2a3..a79ca6e2 100644 --- a/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue @@ -44,7 +44,7 @@ import { reactive, ref } from 'vue'; import { useVuelidate } from '@vuelidate/core'; import { required, email } from '@vuelidate/validators'; -import { useRequest } from '@/composables/useRequest'; +import { useModalFormHandler } from '@/composables/useModalFormHandler'; import { useAuthStore } from '@/stores/auth'; import { useUiStore } from '@/stores/ui'; import route from '@/general/functions/router'; @@ -55,7 +55,7 @@ const props = defineProps<{ section: string; }>(); -const { submit } = useRequest(); +const { submit } = useModalFormHandler(props); const authStore = useAuthStore(); const uiStore = useUiStore(); const rules = { @@ -92,11 +92,8 @@ const submitForm = async () => { access_token: response.payload.access_token, redirect_url: response.payload.redirect_url }); - }, - errorHandler: (response: any) => { - error.value = response.message; } } ); }; - \ No newline at end of file + diff --git a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue index 1503f970..b0388f57 100644 --- a/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue @@ -80,7 +80,7 @@ import { useVuelidate } from '@vuelidate/core'; import { required, email, numeric, sameAs } from '@vuelidate/validators'; import { useAuthStore } from '@/stores/auth'; import { useUiStore } from '@/stores/ui'; -import { useRequest } from '@/composables/useRequest'; +import { useModalFormHandler } from '@/composables/useModalFormHandler'; import route from '@/general/functions/router'; import ErrorMessageComponent from '@/components/general/elements/ErrorMessageComponent.vue'; import ValidationWrapperComponent from '@/components/general/forms/ValidationWrapperComponent.vue'; @@ -90,7 +90,7 @@ const props = defineProps<{ section: string; }>(); -const { submit } = useRequest(); +const { submit } = useModalFormHandler(props); const authStore = useAuthStore(); const uiStore = useUiStore(); @@ -135,9 +135,6 @@ const submitForm = async () => { access_token: response.payload.access_token, redirect_url: response.payload.redirect_url }); - }, - errorHandler: (response: any) => { - error.value = response.message; } } ); diff --git a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue index 1d04c4a1..333d5aa6 100644 --- a/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/LoginFormComponent.vue @@ -92,9 +92,6 @@ const submitForm = async () => { access_token: response.payload.access_token, redirect_url: response.payload.redirect_url }); - }, - errorHandler: (response: any) => { - error.value = response.message; } } ); diff --git a/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue b/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue index 99bc6249..81d6680c 100644 --- a/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue @@ -76,7 +76,7 @@ import { useVuelidate } from '@vuelidate/core'; import { required, email, numeric, sameAs } from '@vuelidate/validators'; import { useAuthStore } from '@/stores/auth'; import { useUiStore } from '@/stores/ui'; -import { useRequest } from '@/composables/useRequest'; +import { useModalFormHandler } from '@/composables/useModalFormHandler'; import route from '@/general/functions/router'; import ErrorMessageComponent from '@/components/general/elements/ErrorMessageComponent.vue'; import ValidationWrapperComponent from '@/components/general/forms/ValidationWrapperComponent.vue'; @@ -85,7 +85,7 @@ const props = defineProps<{ section: string; }>(); -const { submit } = useRequest(); +const { submit } = useModalFormHandler(props); const authStore = useAuthStore(); const uiStore = useUiStore(); @@ -132,9 +132,6 @@ const submitForm = async () => { redirect_url: response.payload.redirect_url }); }, - errorHandler: (response: any) => { - error.value = response.message; - } } ); }; diff --git a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue index 8bf42f90..6ae09e95 100644 --- a/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue +++ b/resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue @@ -34,20 +34,29 @@ - + \ No newline at end of file + diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue index 0eae9c87..e14ee442 100644 --- a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue +++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue @@ -125,6 +125,7 @@ import { ref, watch } from 'vue'; import { useQueueStore } from '@/stores/queue'; import { useRequest } from '@/composables/useRequest'; import route from '@/general/functions/router'; +import { useModalFormHandler } from '@/composables/useModalFormHandler'; interface Props { data?: any; @@ -136,7 +137,7 @@ const props = withDefaults(defineProps(), { }); const queueStore = useQueueStore(); -const { submit } = useRequest(); +const { submit } = useModalFormHandler(props); const item = ref(props.data ? JSON.parse(JSON.stringify(props.data)) : {}); const isLoading = ref(false); @@ -165,9 +166,6 @@ const errorHandler = (err: any) => { const approveAddress = (status: number) => { isLoading.value = true; const url = route('api.order.address.status.update', item.value.id, status); - submit(url, 'put', 'addressVerificationSection', true, true, null, { - successHandler: successHandler, - errorHandler: errorHandler - }); + submit(url, 'put', 'addressVerificationSection', true, true, null); }; diff --git a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue index 504c1744..bcff155d 100644 --- a/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue +++ b/resources/assets/vue/components/addresses/forms/AddressFormComponent.vue @@ -321,4 +321,5 @@ const submitForm = async () => { } }); }; + diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue index 57e4d4c3..6d230d0d 100644 --- a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue +++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue @@ -184,7 +184,7 @@ diff --git a/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue index 923b9974..73c6bed6 100644 --- a/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue +++ b/resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue @@ -209,7 +209,7 @@ const props = defineProps<{ no_action?: boolean; }>(); -const { submit, closeModal, formHandler } = useModalFormHandler({ section: props.section }); +const { submit } = useModalFormHandler({ section: props.section }); const item = ref(props.data); const isLoading = ref(false); @@ -221,17 +221,6 @@ watch(() => props.data, (newData) => { const approvePayment = async (status: string) => { isLoading.value = true; - await submit(route('api.transaction.payment.approval', item.value.id, status), 'put', 'identificationVerificationSection', true, true, null, { - successHandler: () => { - isLoading.value = false; - closeModal(); - formHandler(); - }, - errorHandler: () => { - isLoading.value = false; - closeModal(); - formHandler(); - } - }); + await submit(route('api.transaction.payment.approval', item.value.id, status), 'put', 'identificationVerificationSection', true, true, null); }; diff --git a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue index 13579edc..fc413ea2 100644 --- a/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue @@ -74,6 +74,7 @@ const submitForm = async () => { formHandler(''); authStore.updateProfile(response.payload.data.name); } + }); }; diff --git a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue index 88608e68..f5f1caf0 100644 --- a/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue @@ -65,6 +65,7 @@ const submitForm = async () => { closeModal(); formHandler(''); } + }); }; diff --git a/resources/assets/vue/composables/useModalFormHandler.ts b/resources/assets/vue/composables/useModalFormHandler.ts index bcad747c..20a06dbe 100644 --- a/resources/assets/vue/composables/useModalFormHandler.ts +++ b/resources/assets/vue/composables/useModalFormHandler.ts @@ -1,4 +1,4 @@ -import { inject, computed } from 'vue'; +import { ref, computed } from 'vue'; import { useRequest } from '@/composables/useRequest'; import { useQueueStore } from '@/stores/queue'; import { useUiStore } from '@/stores/ui'; @@ -10,8 +10,14 @@ export function useModalFormHandler(props: { section: string; }) { const uiStore = useUiStore(); const { error, errorMessageHandler } = useErrorMessageHandler(); // const closeModal = inject('closeModal', null) as (() => void) | null; + const localLoading = ref(false); - const isLoading = computed(() => uiStore.isLoading(props.section)); + const isLoading = computed(() => { + if (props.section) { + return uiStore.isLoading(props.section); + } + return localLoading.value; + }); const closeModal = () => { if ((window as any).$) { @@ -20,7 +26,10 @@ export function useModalFormHandler(props: { section: string; }) { }; const formHandler = (errorMessage?: string) => { - queueStore.reloadList({ name: props.section }); + localLoading.value = false; + if (props.section) { + queueStore.reloadList({ name: props.section }); + } if (errorMessage) { errorMessageHandler(errorMessage); } @@ -46,6 +55,12 @@ export function useModalFormHandler(props: { section: string; }) { parameters?: any, options: any = {} ) => { + const activeSection = section || props.section; + + if (!activeSection) { + localLoading.value = true; + } + const { successHandler: customSuccessHandler, errorHandler: customErrorHandler, ...restOptions } = options; const mergedOptions = { ...restOptions, @@ -60,6 +75,7 @@ export function useModalFormHandler(props: { section: string; }) { if (customErrorHandler) { customErrorHandler(response, statusCode, section); } else { + localLoading.value = false; errorHandler(response); } } @@ -68,7 +84,7 @@ export function useModalFormHandler(props: { section: string; }) { return await request.submit( url, method, - section || props.section, + activeSection, successNotification, errorNotification, parameters, diff --git a/routes/web.php b/routes/web.php index 2091eef8..58c8c965 100644 --- a/routes/web.php +++ b/routes/web.php @@ -863,7 +863,7 @@ Route::get('/billplz/fix', function () { $packingList = $payment->owner->owner; if (app()->environment('production')) { try { - (App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList); + //(App()->make(UpdateDoFromVTPortalProcessor::class))->execute($packingList); (App()->make(UpdateDoFromYDPortalProcessor::class))->execute($packingList); } catch (Exception $exception) { echo '
Malformed Address: ' . $orderNumber . '
'; @@ -1336,7 +1336,7 @@ Route::get('fix-payment-status-updated-but-failed-update-invoice', function (Upd $packingList->save(); if (app()->environment('production')) { - $updateDoFromVTPortalProcessor->execute($packingList); + //$updateDoFromVTPortalProcessor->execute($packingList); $updateDoFromYDPortalProcessor->execute($packingList); }