cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/137-project-upgrade-update-1A' into vapor/test

Browse Source
This commit is contained in:
Dillon Ngo
2026-07-01 10:10:34 +08:00
parent ba9db2562b 2566f26c53
commit f36fbfc948
22 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Jobs/Commands/V2/SuccessUpdatePaymentStatusV2CommandJob.php
+1 -1
View File
@@ -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);
}
app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
+1 -1
View File
@@ -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);
}
}
app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
+1 -1
View File
@@ -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));
app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionOneTimeFixProcessor.php
+1 -1
View File
@@ -144,7 +144,7 @@ class CreatePaymentTransactionOneTimeFixProcessor
$packingList->save();
if(app()->environment('production')){
$this->updateDoFromVTPortalProcessor->execute($packingList);
//$this->updateDoFromVTPortalProcessor->execute($packingList);
$this->updateDoFromYDPortalProcessor->execute($packingList);
}
}
app/Classes/Modules/Transactions/Processors/CreatePaymentTransactionProcessor.php
+1 -1
View File
@@ -135,7 +135,7 @@ class CreatePaymentTransactionProcessor
$packingList->save();
if(app()->environment('production')){
$this->updateDoFromVTPortalProcessor->execute($packingList);
//$this->updateDoFromVTPortalProcessor->execute($packingList);
$this->updateDoFromYDPortalProcessor->execute($packingList);
}
}
app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php
+1 -1
View File
@@ -93,7 +93,7 @@ class ReleaseGoodsToCustomerProcessor
$packingList->save();
if (app()->environment('production')) {
$this->updateDoFromVTPortalProcessor->execute($packingList);
// $this->updateDoFromVTPortalProcessor->execute($packingList);
$this->updateDoFromYDPortalProcessor->execute($packingList);
}
app/Console/Commands/SuccessUpdatePaymentStatusButFailedCallback.php
+9 -9
View File
@@ -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();
resources/assets/vue/components/accounts/forms/CompleteRegistrationFormComponent.vue
+2 -5
View File
@@ -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;
}
}
);
resources/assets/vue/components/accounts/forms/DeliveryLoginFormComponent.vue
+3 -6
View File
@@ -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;
}
}
);
};
</script>
</script>
resources/assets/vue/components/accounts/forms/InviteRegistrationFormComponent.vue
+2 -5
View File
@@ -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;
}
}
);
resources/assets/vue/components/accounts/forms/LoginFormComponent.vue
-3
View File
@@ -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;
}
}
);
resources/assets/vue/components/accounts/forms/NewRegistrationFormComponent.vue
+2 -5
View File
@@ -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;
}
}
);
};
resources/assets/vue/components/accounts/forms/RegistrationCheckEmailFormComponent.vue
+12 -3
View File
@@ -34,20 +34,29 @@
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { reactive, ref, watch } from 'vue';
import { useVuelidate } from '@vuelidate/core';
import { required, email } from '@vuelidate/validators';
import { useUiStore } from '@/stores/ui';
import { useRequest } from '@/composables/useRequest';
import { useModalFormHandler } from '@/composables/useModalFormHandler';
import route from '@/general/functions/router';
import ValidationWrapperComponent from '@/components/general/forms/ValidationWrapperComponent.vue';
interface Props {
data?: any;
section: string;
}
const props = withDefaults(defineProps<Props>(), {
data: null
});
const emit = defineEmits(['updateStatus']);
const { submit } = useRequest();
const { submit } = useModalFormHandler(props);
const uiStore = useUiStore();
const parameters = reactive({
resources/assets/vue/components/accounts/forms/RegistrationFormComponent.vue
+3 -6
View File
@@ -260,7 +260,7 @@ import { computed, reactive, ref } from 'vue';
import { useVuelidate } from '@vuelidate/core';
import { required, email, numeric, sameAs, requiredIf } from '@vuelidate/validators';
import { useAuthStore } from '@/stores/auth';
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';
@@ -270,7 +270,7 @@ const props = defineProps<{
section: string;
}>();
const { submit } = useRequest();
const { submit } = useModalFormHandler(props);
const authStore = useAuthStore();
const error = ref('');
@@ -354,9 +354,6 @@ const submitForm = async () => {
access_token: response.payload.access_token,
redirect_url: response.payload.redirect_url
});
},
errorHandler: (response: any) => {
error.value = response.message;
}
}
);
@@ -364,4 +361,4 @@ const submitForm = async () => {
await changeStep('next');
}
};
</script>
</script>
resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue
+3 -5
View File
@@ -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<Props>(), {
});
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);
};
</script>
resources/assets/vue/components/addresses/forms/AddressFormComponent.vue
+1
View File
@@ -321,4 +321,5 @@ const submitForm = async () => {
}
});
};
</script>
resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue
+3 -6
View File
@@ -184,7 +184,7 @@
<script setup lang="ts">
import { ref, watch } from 'vue';
import { useQueueStore } from '@/stores/queue';
import { useRequest } from '@/composables/useRequest';
import { useModalFormHandler } from '@/composables/useModalFormHandler';
import { useUiStore } from '@/stores/ui';
import { useAuthStore } from '@/stores/auth';
import route from '@/general/functions/router';
@@ -197,7 +197,7 @@ const props = defineProps<{
const queueStore = useQueueStore();
const uiStore = useUiStore();
const authStore = useAuthStore();
const { submit } = useRequest();
const { submit } = useModalFormHandler(props);
const expanded = ref(false);
const isEditIdentificationNumber = ref(false);
@@ -229,9 +229,6 @@ const errorHandler = (err: any) => {
const approveDocument = (status: string) => {
isLoading.value = true;
const url = route('api.company.identification.approval', item.value.owner.id, item.value.id, status);
submit(url, 'put', 'identificationVerificationSection', true, true, null, {
successHandler: successHandler,
errorHandler: errorHandler
});
submit(url, 'put', 'identificationVerificationSection', true, true, null);
};
</script>
resources/assets/vue/components/paymentsBilling/elements/PaymentVerificationComponent.vue
+2 -13
View File
@@ -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);
};
</script>
resources/assets/vue/components/settings/forms/EditUserProfileFullnameFormComponent.vue
+1
View File
@@ -74,6 +74,7 @@ const submitForm = async () => {
formHandler('');
authStore.updateProfile(response.payload.data.name);
}
});
};
</script>
resources/assets/vue/components/settings/forms/ResetUserPasswordFormComponent.vue
+1
View File
@@ -65,6 +65,7 @@ const submitForm = async () => {
closeModal();
formHandler('');
}
});
};
</script>
resources/assets/vue/composables/useModalFormHandler.ts
+20 -4
View File
@@ -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,
routes/web.php
+2 -2
View File
@@ -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 '<br><span style="color: red">Malformed Address: <a href="' . route('order.show', $orderNumber) . '" target="_blank">' . $orderNumber . '</a></span><br>';
@@ -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);
}