update create billPlz service, if environment is local, use withoutVerifying()

app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php

@@ -22,7 +22,7 @@ class CreatesBillplzBill
     public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null, ?bool $wallet = null) {
         try{
 //            config('billplz.maybank')
-            $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [
+            $requestBody = [
                 'collection_id' => config('billplz.collection_id'),
                 'name' => $name,
                 'email' => $email,
@@ -34,7 +34,13 @@ class CreatesBillplzBill
                 'reference_1' => $bankCode ? $bankCode : '',
                 'reference_2_label' => 'Bill Number',
                 'reference_2' => $billNumber
-            ]);
+            ];
+
+            if (in_array(app()->environment(), ['development', 'staging', 'production'])) {
+                $response = Http::withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
+            } else {
+                $response = Http::withoutVerifying()->withBasicAuth(config('billplz.api_key') . ':', '')->post(config('billplz.base_url') . '/api/v3/bills', $requestBody);
+            }
 
             if($response->successful()){
                 $data = $response->json();

app/Classes/Modules/Companies/ControllersLogic/UpdateCompanyNameLogic.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\ControllersLogic;
-
-
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-
-use App\Classes\Modules\Companies\Services\UpdatesCompanyModuleName;
-use App\Classes\Modules\Companies\Services\FetchesCompany;
-use App\Classes\Modules\Companies\Standards\Rules\CanUpdateCompany;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Classes\Modules\Companies\Services\UpdatesCompanyName;
-use App\Http\Resources\CompanyResource;
-use ErrorException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyNameLogic extends AbstractControllerLogic
-{
-
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Updated Company',
-            'message' => 'You have successfully updated the Company'
-        ];
-    }
-
-    /** @var FetchesCompany */
-    private $fetchesCompany;
-
-    /** @var UpdatesCompanyName */
-    private $updatesCompanyName;
-
-    /** @var UpdatesCompanyModuleName */
-    private $updatesCompanyModuleName;
-
-    /**
-     * UpdateCompanyControllersLogic constructor.
-     * @param FetchesCompany $fetchesCompany
-     * @param UpdatesCompanyName $updatesCompany
-     * @param UpdatesCompanyModuleName $updatesCompanyModuleName
-     */
-    public function __construct(FetchesCompany $fetchesCompany,UpdatesCompanyName $updatesCompanyName, UpdatesCompanyModuleName $updatesCompanyModuleName)
-    {
-        $this->fetchesCompany = $fetchesCompany;
-        $this->updatesCompanyName = $updatesCompanyName;
-        $this->updatesCompanyModuleName = $updatesCompanyModuleName;
-    }
-
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws ErrorException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id')]);
-
-        $object = new CompanyObject($request->input('name'), $query->reference, $query->type);
-
-        $this->updatesCompanyName->execute($query, $object);
-
-        $this->updatesCompanyModuleName->execute($query->companyModules()->first(), $object->getName());
-
-        return $this->resourceResponse(new CompanyResource($query));
-
-    }
-
-}

app/Classes/Modules/Companies/Services/UpdatesCompanyName.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Companies\Services;
-
-use App\Classes\General\Eloquent\AbstractUpdateRecord;
-use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
-use App\Models\Company;
-
-class UpdatesCompanyName extends AbstractUpdateRecord
-{
-
-    /**
-     * @param Company $model
-     * @param int $status
-     * @return \Illuminate\Database\Eloquent\Model
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function execute(Company $model, CompanyObject $object)
-    {
-        $model->name = $object->getName();
-        return $this->handler($model);
-
-    }
-}

app/Classes/Modules/Exports/Services/ExportsCustomerTotalOrderByYear.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Exports\Services;
-
-use App\Classes\ValueObjects\Constants\PackingListType;
-use App\Models\CompanyModule;
-use App\Models\Company;
-use App\Models\PackingList;
-use Carbon\Carbon;
-use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\FromCollection;
-use Maatwebsite\Excel\Concerns\ShouldAutoSize;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Illuminate\Http\Request;
-
-class ExportsCustomerTotalOrderByYear implements FromCollection, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
-{
-    use Exportable;
-
-    private $request;
-
-    public function __construct(Request $request)
-    {
-        $this->request = $request;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'CompanyId',
-            'CompanyName',
-            'CompanyReference',
-            'TotalCbm'
-        ];
-    }
-
-    /**
-     * @return \Illuminate\Support\Collection|mixed
-     */
-    public function collection()
-    {
-        $packingLists = PackingList::where('type', PackingListType::SHIPPING_PACKING_LIST)->whereHas('containers', function($container){
-            return $container->where('loading_date', '>=', Carbon::parse('01-01-' . $this->request->route('year')))
-                ->where('loading_date', '<=', Carbon::parse('31-12-' . $this->request->route('year')));
-        })->get();
-
-        $packingLists = $packingLists->groupBy(function ($packingList){
-            return $packingList->owner->company_module_id;
-        })->sortByDesc(function($companyModule){
-            return $companyModule->sum(function($packingList){
-                return $packingList->packages->sum(function ($package){
-                    return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
-                });
-            });
-        })->take(10);
-        return $packingLists;
-    }
-
-    /**
-     * @param $row
-     * @return array
-     */
-    public function map($row): array
-    {
-
-        $companyModule = $row[0]->owner->companyModule;
-        $marking = $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference;
-
-        $cbm = $row->sum(function($packingList){
-            return $packingList->packages->sum(function ($package){
-                return (($package->width / 100) * ($package->height / 100) * ($package->length / 100)) * $package->quantity;
-            });
-        });
-
-        return [
-            $companyModule->company_id,
-            $companyModule->name,
-            $marking,
-            $cbm
-        ];
-    }
-}

app/Http/Controllers/Companies/UpdateCompanyNameController.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Companies;
-
-use App\Classes\Modules\Companies\ControllersLogic\UpdateCompanyNameLogic;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class UpdateCompanyNameController extends Controller
-{
-    /**
-     * @param Request $request
-     * @param UpdateCompanyLogic $logic
-     * @return JsonResponse
-     */
-    public function rename(Request $request, UpdateCompanyNameLogic $logic): JsonResponse
-    {
-        return $logic->execute($request);
-    }
-}

app/Http/Controllers/Exports/ExportCustomersToExcelController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Exports;
 
 
 use App\Classes\Modules\Exports\Services\ExportsCustomersOrderLatestDate;
-use App\Classes\Modules\Exports\Services\ExportsCustomerTotalOrderByYear;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 use App\Models\User;
 use Illuminate\Http\Request;
@@ -32,11 +31,4 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
-
-    public function totalOrders(Request $request){
-        $exportsTotalOrders = new ExportsCustomerTotalOrderByYear($request);
-        $response = $exportsTotalOrders->download('total-orders-' . $request->route('year') . '.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
-        ob_end_clean();
-        return $response;
-    }
 }

app/Http/Resources/PackageResource.php

@@ -29,7 +29,6 @@ class PackageResource extends JsonResource
             'weight' => $this->weight,
             'quantity' => $this->quantity,
             'cbm' => (($this->width / 100) * ($this->height / 100) * ($this->length / 100)) * $this->quantity,
-            'reference' => $this->packingList->reference,
             'status' => $this->status,
             $this->mergeWhen($originalPackingList->owner instanceof Order, [
                 'order' => New OrderResource($originalPackingList->owner)

resources/assets/vue/components/orders/elements/PackageComponent.vue

@@ -19,12 +19,6 @@
                                     <p class="bold m-b-5 fs-12">{{item.description}}</p>
                                 </div>
                             </div>
-                            <div class="row m-b-10 align-items-center" v-if="$store.getters.isAdmin">
-                                <div class="col-auto">
-                                    <p class="no-margin all-caps fs-10 lh-10 light">Reference</p>
-                                    <p class="no-margin fs-12">{{item.reference}}</p>
-                                </div>
-                            </div>
                             <div class="row b-t b-b b-grey m-b-15">
                                 <div class="col">
                                     <div class="row">
@@ -180,4 +174,4 @@
         },
         mixins: [componentHandler]
     }
-</script>
+</script>

resources/assets/vue/components/orders/elements/ParcelComponent.vue

@@ -67,14 +67,6 @@
                             <p class="no-margin bold text-info fs-12"><a :href="route('customer.profile', item.order.company_module.marking)">{{item.order.company_module.marking}}</a></p>
                         </div>
                     </div>
-                    <div class="row m-b-5" v-if="$store.getters.isAdmin">
-                        <div class="col-auto p-r-5">
-                            <p class="no-margin all-caps fs-10 light">Reference</p>
-                        </div>
-                        <div class="col p-l-5">
-                            <p class="no-margin bold text-info fs-12">{{item.reference}}</p>
-                        </div>
-                    </div>
                     <div class="row m-b-5">
                         <div class="col-auto p-r-5">
                             <p class="no-margin all-caps fs-10 light">Order Number</p>

routes/company.php

@@ -8,7 +8,6 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
     Route::post('/create', 'CreateCompanyController@create')->name('create');
     Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
     Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
-    Route::put('/name/update/{id}', 'UpdateCompanyNameController@rename')->name('update.name');
 
     Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
 

routes/web.php

@@ -7,25 +7,20 @@ use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
 use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
 use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
 use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromVTPortalProcessor;
 use App\Classes\Modules\Orders\Processors\UpdateDoFromYDPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
 use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\OrderRoleTypes;
 use App\Classes\ValueObjects\Constants\PackageType;
 use App\Models\CompanyConnection;
 use App\Models\CompanyModule;
-use App\Models\Document;
 use App\Models\PackingList;
 use Illuminate\Support\Facades\Crypt;
 use App\Models\Container;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
-use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 /*
 |--------------------------------------------------------------------------
@@ -317,7 +312,6 @@ Route::get('/export/on-hold-packing-list', 'Exports\ExportPendingArrangementPack
 Route::get('/export/arrived-parcel', 'Exports\ExportArrivedParcelController@export')->name('packing_list.arrived_parcel.export');
 Route::get('/export/parcel-summary', 'Exports\ExportArrivedParcelController@summary');
 Route::get('/export/parcel-postcode', 'Exports\ExportParcelPostcodesController@export');
-Route::get('/export/{year}/customer-total-order', 'Exports\ExportCustomersToExcelController@totalOrders');
 
 Route::get('/settings', function () {
     return view('pages.settings');
@@ -652,34 +646,4 @@ Route::get('/billplz/fix', function(){
 });
 
 
-Route::get('/invoices/fix', function(){
-
-    $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);
-        }
-    }
-
-});
-
-