diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CombineInvoiceLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CombineInvoiceLogic.php deleted file mode 100644 index 26bbfc3d..00000000 --- a/app/Classes/Modules/Transactions/ControllersLogic/CombineInvoiceLogic.php +++ /dev/null @@ -1,95 +0,0 @@ - 'Shipping Invoice Status', - 'message' => 'You have successfully updated multiple shipping invoices status' - ]; - } - - /** @var FetchesPackingList */ - private $fetchesPackingList; - - /** @var UpdatesTransactionStatus */ - private $updatesTransactionStatus; - - /** @var CreatesDocument */ - private $createsDocument; - - /** @var CreatesFiles */ - private $createsFiles; - - /** - * ApprovePaymentVerificationLogic constructor. - * @param FetchesPackingList $fetchesPackingList - * @param UpdatesTransactionStatus $updatesTransactionStatus - * @param CreatesDocument $createsDocument - * @param CreatesFiles $createsFiles - * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor - */ - public function __construct(FetchesPackingList $fetchesPackingList, UpdatesTransactionStatus $updatesTransactionStatus, CreatesDocument $createsDocument, CreatesFiles $createsFiles) - { - $this->fetchesPackingList = $fetchesPackingList; - $this->updatesTransactionStatus = $updatesTransactionStatus; - $this->createsDocument = $createsDocument; - $this->createsFiles = $createsFiles; - } - - /** - * @param Request $request - * @return JsonResponse - * @throws \App\Classes\Exceptions\MalformedRequestException - */ - public function logic(Request $request) : JsonResponse - { - - $orders = \App\Models\Order::whereIn('company_module_id', [294, 2703])->get(); - - foreach ($orders as $order){ - $invoices = $order->transactions()->where('transactions.type', \App\Classes\ValueObjects\Constants\TransactionType::SHIPPING_INVOICE)->get(); - foreach ($invoices as $invoice){ - - $invoice->documents()->delete(); - - $transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]); - - $document_object = new DocumentObject( - DocumentType::SHIPPING_INVOICE, - [chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))], - '', - ApprovalStatus::COMPLETED, - 'shipping_invoice' - ); - - /** @var Document $document */ - $document = (App()->make(\App\Classes\Modules\Documents\Services\CreatesDocument::class))->execute($invoice, $document_object); - - (App()->make(\App\Classes\Modules\Documents\Services\CreatesFiles::class))->execute($document, $document_object); - } - } - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateCombinedInvoicesLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateCombinedInvoicesLogic.php index 17190e66..93a3a0f9 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateCombinedInvoicesLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateCombinedInvoicesLogic.php @@ -5,14 +5,8 @@ namespace App\Classes\Modules\Transactions\ControllersLogic; use App\Classes\Notifications\InvoiceIssuedEmail; use Illuminate\Http\Request; -<<<<<<< Updated upstream -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes -======= ->>>>>>> Stashed changes use Illuminate\Http\JsonResponse; use Meneses\LaravelMpdf\Facades\LaravelMpdf; use App\Classes\ValueObjects\Constants\DocumentType; @@ -73,19 +67,7 @@ class CreateCombinedInvoicesLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { -<<<<<<< Updated upstream -<<<<<<< Updated upstream $items = $request->input('ids'); -======= - - $items = $request->input('ids'); - // dd(is_array($items)); ->>>>>>> Stashed changes -======= - - $items = $request->input('ids'); - // dd(is_array($items)); ->>>>>>> Stashed changes $invoice_transactions=array(); foreach($items as $item){ diff --git a/app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php b/app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php index d903e647..1b87441f 100644 --- a/app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php +++ b/app/Http/Controllers/Transactions/CreateCombinedInvoicesController.php @@ -12,6 +12,4 @@ class CreateCombinedInvoicesController public function combine(Request $request, CreateCombinedInvoicesLogic $logic): JsonResponse { return $logic->execute($request); } - - } diff --git a/app/Http/Controllers/Transactions/InvoicesController.php b/app/Http/Controllers/Transactions/InvoicesController.php deleted file mode 100644 index d55e6161..00000000 --- a/app/Http/Controllers/Transactions/InvoicesController.php +++ /dev/null @@ -1,16 +0,0 @@ -execute($request); -} - -} \ No newline at end of file diff --git a/app/Http/Middleware/WebRouteLogs.php b/app/Http/Middleware/WebRouteLogs.php index c8c60b20..b5200de6 100644 --- a/app/Http/Middleware/WebRouteLogs.php +++ b/app/Http/Middleware/WebRouteLogs.php @@ -23,14 +23,13 @@ class WebRouteLogs $ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR'); $url = $request->fullUrl(); $request_method = $request->method(); - $platform = $request->header('sec-ch-ua-platform'); + $platform = $request->header('sec-ch-ua-platform'); $browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "'); $geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address")); $longitude = $geo["geoplugin_longitude"]; $latitude = $geo["geoplugin_latitude"]; $last_page = url()->previous(); $countryName = $geo["geoplugin_countryName"]; - $route_log = [ 'user_id' => Auth::user() ? Auth::user()->id : 0, @@ -40,11 +39,10 @@ class WebRouteLogs 'request_method' => $request_method, 'browser' => $browser, 'platform' => $platform, - 'longitude' => $longitude, + 'longitude' => $longitude, 'latitude' => $latitude, 'last_page' => $last_page, 'countryname' => $countryName, - 'route_type' => RouteType::WEB, ]; diff --git a/composer.json b/composer.json index 7da38875..af20f32d 100644 --- a/composer.json +++ b/composer.json @@ -62,11 +62,9 @@ } }, "config": { - "platform-check": false, "optimize-autoloader": true, "preferred-install": "dist", "sort-packages": true - }, "minimum-stability": "dev", "prefer-stable": true diff --git a/routes/transaction.php b/routes/transaction.php index 06e9fa93..3a1af975 100644 --- a/routes/transaction.php +++ b/routes/transaction.php @@ -25,10 +25,6 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' => route::put('/combine', 'CreateCombinedInvoicesController@combine')->name('combine'); }); - Route::group(['prefix' => 'invoices', 'as' => 'invoices.'], function () { - route::put('/invoices', 'InvoicesController@invoices'); - }); - route::post('/shipping-invoice/calculator', 'ShippingEstimationCalculatorController@calculate')->name('shipping.estimation.calculator'); // Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {