diff --git a/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php b/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php index e3eb1e2a..648f5b4a 100644 --- a/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php +++ b/app/Classes/Modules/Orders/ControllersLogic/CreateSupplierTaxRebateLogic.php @@ -57,13 +57,9 @@ class CreateSupplierTaxRebateLogic extends AbstractControllerLogic */ public function logic(Request $request): JsonResponse { - Log::info('finding order'); - /** @var Order $order */ $order = $this->fetchesOrder->execute(['id' => $request->route('id')]); - Log::info('taxRebate'); - $taxRebate = SupplierTaxRebate::create([ 'order_id' => $order->id, 'supplier_name' => $request->input('supplier_name'), @@ -76,7 +72,6 @@ class CreateSupplierTaxRebateLogic extends AbstractControllerLogic public function generateUniqueReferenceNumber(?string $prefix = '', ?int $length = 9): string { - Log::info('generating unique reference number'); // regenerate new reference number until a new unique reference is found do { $reference = $prefix . rand((int)('1' . str_repeat('0', $length - 2) . '1'), (int) str_repeat('9', $length)); diff --git a/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php b/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php new file mode 100644 index 00000000..ab2adcb8 --- /dev/null +++ b/app/Classes/Modules/Orders/ControllersLogic/DeleteSupplierTaxRebateLogic.php @@ -0,0 +1,41 @@ + 'Delete Supplier Tax Rebate', + 'message' => 'You have successfully deleted a Supplier Tax Rebate' + ]; + } + + /** + * DeleteSupplierTaxRebateLogic constructor. + */ + public function __construct() {} + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function logic(Request $request): JsonResponse + { + SupplierTaxRebate::find($request->route('id'))->delete(); + + return $this->response([]); + } +} diff --git a/app/Http/Controllers/Orders/DeleteSupplierTaxRebateController.php b/app/Http/Controllers/Orders/DeleteSupplierTaxRebateController.php new file mode 100644 index 00000000..dd2c0e35 --- /dev/null +++ b/app/Http/Controllers/Orders/DeleteSupplierTaxRebateController.php @@ -0,0 +1,21 @@ +execute($request); + } +} \ No newline at end of file diff --git a/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue b/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue new file mode 100644 index 00000000..28edb2e4 --- /dev/null +++ b/resources/assets/vue/components/orders/forms/DeleteTaxRebateQrCodeFormComponent.vue @@ -0,0 +1,45 @@ + + diff --git a/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue b/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue index 8d16830e..c26100b7 100644 --- a/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue +++ b/resources/assets/vue/components/orders/forms/TaxRebateQrCodeFormComponent.vue @@ -28,6 +28,11 @@ +
+
+ +
+
@@ -58,6 +63,11 @@ + +
+ +
+
@@ -106,6 +116,7 @@ export default { }, step: this.data.supplier_tax_rebate.length ? 'list_qr' : '1', qr_code_img_url: this.$qr_code_img_url, + delete_qr_code_id: null, fields: { // reference_number: 'Reference Number', supplier_name: 'Supplier Name', @@ -129,9 +140,16 @@ export default { } this.step = step; }, + resetStatus() { + this.step = 'list_qr'; + }, create() { this.submit(this.route('api.order.tax_rebate.create', this.data.id), 'post', this.section, true, true); }, + deleteQrCode(id) { + this.delete_qr_code_id = id; + this.step = 'delete_qr' + }, download(param) { this.isLoading = true; let url = route('order.taxt_rebate_qr.download', this.data.id) + '?tax_rebate_refeerence=' + param.reference_number; diff --git a/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileV2SectionComponent.vue index 8f570d19..17d47897 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 Rebate QR Code
diff --git a/resources/views/pdfs/tax_rebate_qr.blade.php b/resources/views/pdfs/tax_rebate_qr.blade.php index e76c61b7..449348db 100644 --- a/resources/views/pdfs/tax_rebate_qr.blade.php +++ b/resources/views/pdfs/tax_rebate_qr.blade.php @@ -16,7 +16,7 @@

退税单

-

供应商: {{$supplierTaxRebate['supplier_name']}}

+

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

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

@@ -44,8 +44,8 @@ - diff --git a/routes/order.php b/routes/order.php index 52ac0805..4023400f 100644 --- a/routes/order.php +++ b/routes/order.php @@ -24,5 +24,6 @@ Route::group(['prefix' => 'order', 'as' => 'order.', 'namespace' => 'Orders'], f Route::get('/packages/{id}', 'FetchOrderPackagesController@fetch')->name('packages'); Route::post('/{id}/supplier-tax-rebate/create', 'CreateSupplierTaxRebateController@create')->name('tax_rebate.create'); + Route::post('/supplier-tax-rebate/{id}/delete', 'DeleteSupplierTaxRebateController@delete')->name('tax_rebate.delete'); });
-

{{$marking}}{{$order->reference}}

+
+

{{$marking}}{{$order->reference}} 退税