diff --git a/app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php b/app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php index 92ff26bf..7c68d2f7 100644 --- a/app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/OneTimeTransactionFixBillplzFailedCbV2CommandJob.php @@ -8,6 +8,7 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; +use App\Classes\Modules\Billplzs\Processors\CallbackBillplzProcessor; use App\Classes\Modules\Billplzs\Processors\CallbackBillplzDataPatchProcessor; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Models\Transaction; @@ -19,26 +20,26 @@ class OneTimeTransactionFixBillplzFailedCbV2CommandJob implements ShouldQueue public function handle() { - Log::info(Carbon::now() . ': Start job - One time fix failled callback from billplz for transaction with id 17310 cron ended.'); + Log::info(Carbon::now() . ': Start job - One time fix failled callback from billplz cron ended.'); $start = new Carbon(); - // ini_set('memory_limit', '-1'); - - //Transaction fix with this one time fix command: 15205, 16803, 17310 + //Transaction fix with this one time fix command: 15205, 16803, 17310, 22008, 6770 //This transaction, 16803 has approve payment but not its owner, shipping invoice - $transaction = Transaction::whereIn('id', [17310])->first(); - Log::info(Carbon::now() . ' : One time fix failled callback from billplz for transaction with id 17310 cron started.'); + $transactions = Transaction::whereIn('id', [22008, 6770])->get(); + Log::info(Carbon::now() . ' : One time fix failled callback from billplz started.'); - if($transaction && $transaction->id == 17310){ + foreach ($transactions as $transaction){ + if($transaction){ - Log::info(Carbon::now() . ' : 17310.'); - $status = ApprovalStatus::APPROVED; - // $this->callbackBillplzProcessor->execute($transaction, $status); - (App()->make(CallbackBillplzDataPatchProcessor::class))->execute($transaction, $status); + Log::info(Carbon::now() . ' : '.$transaction->id); + $status = ApprovalStatus::APPROVED; + (App()->make(CallbackBillplzProcessor::class))->execute($transaction, $status); + // (App()->make(CallbackBillplzDataPatchProcessor::class))->execute($transaction, $status); + } } $end = new Carbon(); $elapsedTime = $start->diff($end)->format('%H:%I:%S'); - Log::info(Carbon::now() . ': End job - One time fix failled callback from billplz for transaction with id 17310 cron ended. ElapsedTime: ' . $elapsedTime . '.'); + Log::info(Carbon::now() . ': End job - One time fix failled callback from billplz cron ended. ElapsedTime: ' . $elapsedTime . '.'); } } diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php index 648f5b4a..7c01d501 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php @@ -24,8 +24,8 @@ class CreateSupplierTaxRebateLogic extends AbstractControllerLogic protected function notification(): array { return [ - 'title' => 'Create Supplier Tax Rebate', - 'message' => 'You have successfully created a Supplier Tax Rebate' + 'title' => 'Create Supplier Tax Refund', + 'message' => 'You have successfully created a Supplier Tax Refund' ]; } diff --git a/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php b/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php index ab2adcb8..cac68997 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php @@ -17,8 +17,8 @@ class DeleteSupplierTaxRebateLogic extends AbstractControllerLogic protected function notification(): array { return [ - 'title' => 'Delete Supplier Tax Rebate', - 'message' => 'You have successfully deleted a Supplier Tax Rebate' + 'title' => 'Delete Supplier Tax Refund', + 'message' => 'You have successfully deleted a Supplier Tax Refund' ]; } diff --git a/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php b/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php index c00bad32..3d23f50d 100644 --- a/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/ReleaseGoodsToCustomerProcessor.php @@ -61,6 +61,8 @@ class ReleaseGoodsToCustomerProcessor $invoiceTransactions = $packingList->transactions()->where('status', ApprovalStatus::APPROVED)->whereIn('type', [TransactionType::SHIPPING_INVOICE, TransactionType::STORAGE_INVOICE])->get(); } + LogHelper::channel('storage_invoices')->info('invoiceTransactions: '. json_encode($invoiceTransactions)); + //Part 1: Process each single invoice type and get the total of all invoices (STORAGE + SHIPPING) foreach($invoiceTransactions as $invoiceTransaction){ $totalInvoiceAmountPaid = $invoiceTransaction->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount'); diff --git a/app/Http/Controllers/Orders/DownloadTaxRebateQrPdfController.php b/app/Http/Controllers/Orders/DownloadTaxRebateQrPdfController.php index c91b056b..57904485 100644 --- a/app/Http/Controllers/Orders/DownloadTaxRebateQrPdfController.php +++ b/app/Http/Controllers/Orders/DownloadTaxRebateQrPdfController.php @@ -65,7 +65,7 @@ class DownloadTaxRebateQrPdfController $supplierTaxRebate = SupplierTaxRebate::where('reference_number', $tax_rebate_refeerence)->first(); if (!$supplierTaxRebate) { // If not found, throw an error - abort(404, 'Supplier Tax Rebate not found'); + abort(404, 'Supplier Tax Refund not found'); } $data = [ diff --git a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue index 9f69a28e..66ce9ffa 100644 --- a/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue +++ b/resources/assets/vue/components/companies/elements/NewServiceAnnouncementComponent.vue @@ -2,7 +2,7 @@
-
+
@@ -68,6 +68,39 @@
+
+
+
+
+
+
+
+
EN
+
中文
+
+
+
+
最新消息
+
+ CIEF 正式开启了新服务【海运散货退税服务】！供应商要求出口退税不再太复杂，只需一路往常的把货物发到广州仓库，多加几个简单步骤，即可轻松满足供应商的退税需求，同时优化清关流程，成本节省高达 8 倍！ + 👉 点此查看教程！ +
+
+
+
Great News
+
+ CIEF officially launches the new service 【Sea Shipping LCL Tax Refund Service】! + Supplier requests for export tax refunds are no longer complicated. Simply continue sending goods to the Guangzhou warehouse as usual, add a few simple procedures, and easily meet your supplier's tax refund requirements. At the same time, we optimize the clearance process, and can help save up to 8 times on costs! + 👉 Click here for the tutorial! +
+
+
+
+
+
+
+
+
@@ -85,6 +118,7 @@ failed: false, part: 0, isFetchCompany: false, + advertisementLanguage: 'en', company: null } }, @@ -97,6 +131,9 @@ this.isFetchCompany = true; this.submit(route('api.company.show', this.$store.getters.getCompanyId), 'get', this.section, false, false) }, + updateAdvertisementLanguage(value){ + this.advertisementLanguage = value; + }, activateService(segmentId){ this.parameters = { segment_id: segmentId diff --git a/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue b/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue index 28edb2e4..e4d9df4c 100644 --- a/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue @@ -5,8 +5,8 @@
-
Delete Tax Rebate QR Code
-
Are you sure you want to delete this Tax Rebate QR Code?
+
Delete Tax Refund QR Code
+
Are you sure you want to delete this Tax Refund QR Code?
diff --git a/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue b/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue index c26100b7..65aa81f9 100644 --- a/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue @@ -9,7 +9,7 @@
-

List Of Tax Rebate QR Code

+

List Of Tax Refund QR Code

@@ -48,8 +48,8 @@
-

Are you sure you want to create a Tax Rebate QR Code?

-

A Tax Rebate QR Code allows suppliers to claim tax rebates.
We need some additional information for this +

Are you sure you want to create a Tax Refund QR Code?

+

A Tax Refund QR Code allows suppliers to claim tax refunds.
We need some additional information for this service.

@@ -71,7 +71,7 @@
-

Create Tax Rebate QR Code?

+

Create Tax Refund QR Code?

diff --git a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue index 17d47897..6db2c0a3 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue @@ -138,7 +138,7 @@ -
Tax Rebate QR Code
+
Tax Refund QR Code
diff --git a/resources/views/pdfs/tax_rebate_qr.blade.php b/resources/views/pdfs/tax_rebate_qr.blade.php index 449348db..f08d245d 100644 --- a/resources/views/pdfs/tax_rebate_qr.blade.php +++ b/resources/views/pdfs/tax_rebate_qr.blade.php @@ -14,11 +14,11 @@
- +

退税单

联络人: {{$supplierTaxRebate['supplier_name']}}

联络号码: {{$supplierTaxRebate['supplier_contact_number']}}

- +