update force create order delivery address

app/Classes/General/Eloquent/Filters/OwnerType.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class OwnerType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('owner_type', $value);
+    }
+
+}

app/Classes/Modules/Addresses/ControllersLogic/CreateBillingAddressLogic.php

@@ -68,19 +68,19 @@ class CreateBillingAddressLogic extends AbstractControllerLogic
     {
         $companyModule = $this->fetchesCompanyModule->execute(['id' => $request->input('company_module_id')]);
         
-        $address = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+        $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
 
-        if ($address->type !== AddressType::BILLING || $address->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+        if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
             // delete all current billing address
             Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
 
-            // create addrress
-            $billingAddress = new AddressObject($address->street_one, $address->street_two, $address->country_id, $address->state_id, $address->district_id, $address->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $address->reference);
+            // create new billing addrress
+            $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
             $this->canCreateAddress->passes($billingAddress);
             $this->createsAddress->execute($companyModule, $billingAddress);
         }
 
-        return $this->resourceResponse(new AddressResource($address));
+        return $this->resourceResponse(new AddressResource($billingAddressInputed));
     }
 
 }

app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php

@@ -4,13 +4,19 @@ namespace App\Classes\Modules\Orders\ControllersLogic;
 
 use App\Classes\Exceptions\RequestValidationException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
 use App\Classes\Modules\Addresses\Services\FetchesAddress;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Companies\Services\FetchesCompanyModule;
 use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
 use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\WarehouseReferences;
 use App\Http\Resources\OrderResource;
+use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
+use App\Models\Address;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 
@@ -39,6 +45,12 @@ class CreateOrderLogic extends AbstractControllerLogic
     /** @var GeneratesOrderNumber */
     private $generatesOrderNumber;
 
+    /** @var CreatesAddress */
+    private $createsAddress;
+
+    /** @var CanCreateAddress */
+    private $canCreateAddress;
+
     /**
      * CreateOrderLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -46,14 +58,18 @@ class CreateOrderLogic extends AbstractControllerLogic
      * @param CreateOrderProcessor $createOrderProcessor
      * @param FetchesCompanyModule $fetchesCompanyModule
      * @param GeneratesOrderNumber $generatesOrderNumber
+     * @param CreatesAddress $createsAddress
+     * @param CanCreateAddress $canCreateAddress
      */
-    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber)
+    public function __construct(FetchesCompany $fetchesCompany, FetchesAddress $fetchesAddress, CreateOrderProcessor $createOrderProcessor, FetchesCompanyModule $fetchesCompanyModule, GeneratesOrderNumber $generatesOrderNumber, CreatesAddress $createsAddress, CanCreateAddress $canCreateAddress)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->fetchesAddress = $fetchesAddress;
         $this->createOrderProcessor = $createOrderProcessor;
         $this->fetchesCompanyModule = $fetchesCompanyModule;
         $this->generatesOrderNumber = $generatesOrderNumber;
+        $this->createsAddress = $createsAddress;
+        $this->canCreateAddress = $canCreateAddress;
     }
 
 
@@ -66,6 +82,21 @@ class CreateOrderLogic extends AbstractControllerLogic
 
         $originWarehouse = $this->fetchesCompanyModule->execute(['id' => $request->input('warehouse_id')]);
 
+        if ($request->input('billing_address_id')) {
+            $companyModule = $company->companyModules->first();
+            $billingAddressInputed = $this->fetchesAddress->execute(['id' => $request->input('billing_address_id')]);
+
+            if ($billingAddressInputed->type !== AddressType::BILLING || $billingAddressInputed->id !== $companyModule->addresses->where('type', AddressType::BILLING)->first()->id) {
+                // delete all current billing address
+                Address::where('owner_type', CompanyModule::class)->where('owner_id', $request->input('company_module_id'))->where('type', AddressType::BILLING)->delete();
+    
+                // create new billing addrress
+                $billingAddress = new AddressObject($billingAddressInputed->street_one, $billingAddressInputed->street_two, $billingAddressInputed->country_id, $billingAddressInputed->state_id, $billingAddressInputed->district_id, $billingAddressInputed->postcode, AddressType::BILLING, ApprovalStatus::APPROVED, $billingAddressInputed->reference);
+                $this->canCreateAddress->passes($billingAddress);
+                $this->createsAddress->execute($companyModule, $billingAddress);
+            }
+        }
+
         if(!in_array($company->companyModules()->importers()->first()->id, WarehouseReferences::YD_EXEMPT_LIST)){
             $originWarehouse = $this->fetchesCompanyModule->execute(['reference' =>  $originWarehouse->reference === WarehouseReferences::VT_GUANG_ZHOU ? WarehouseReferences::YD_GUANG_ZHOU : WarehouseReferences::YD_YIWU]);
         }

resources/assets/vue/components/addresses/forms/AddressFormComponent.vue

@@ -198,6 +198,9 @@
         },
         methods:{
             submitForm(){
+                if (this.type) {
+                    this.parameters.type = this.type;
+                }
                 this.submit(this.data ? (this.route('api.address.update', this.data.id)) : (this.route('api.address.create')), this.data ? 'put' : 'post', 'addressList', true, true);
             },
         },

resources/assets/vue/components/addresses/sections/BillingAddressSectionComponent.vue

@@ -83,11 +83,12 @@
                 billingAddressFilters: {
                     per_page: 10, 
                     HasMorphCompanyModule: this.company_module_id,
+                    ownerType: 'App\\Models\\CompanyModule',
                     type: 1
                 },
                 parameters : {
                     company_module_id: this.company_module_id,
-                    billing_address_id: '',
+                    billing_address_id: null,
                 },
                 item:{
                     id:null

resources/assets/vue/components/orders/forms/OrderFormComponent.vue

@@ -72,7 +72,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row justify-content-center" v-if="step === 2">
+            <div class="row justify-content-center" v-if="step === 2 && !chooseBillingAddress">
                 <div class="col col-md-10">
                     <div class="row m-b-20">
                         <div class="col">
@@ -88,7 +88,7 @@
                             </div>
                             <div class="row justify-content-center">
                                 <div class="col col-md-10">
-                                    <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: company.company_module.id}">
+                                    <list-component style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="{per_page: 10, HasMorphCompanyModule: company.company_module.id, type:2}">
                                         <template slot="list" slot-scope="{data}">
                                             <select-address-component :data="data" :value="parameters.address_id" v-model="parameters.address_id"></select-address-component>
                                         </template>
@@ -119,7 +119,72 @@
                                     <button type="button" class="btn btn-lg btn-default b-rad-none" @click="step--">back</button>
                                 </div>
                                 <div class="col p-l-5">
-                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.address_id">Create Order</button>
+                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.address_id && company.company_module.billingAddress">Create Order</button>
+                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click=" chooseBillingAddress = !chooseBillingAddress" v-if="parameters.address_id && !company.company_module.billingAddress">Select Billing Address</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row justify-content-center" v-if="step === 2 && chooseBillingAddress">
+                <div class="col col-md-10">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <div class="row m-b-20 text-info">
+                                <div class="col text-center">
+                                    <h3>Please select the <b>Billing Address</b></h3>
+                                </div>
+                            </div>
+                            <div class="row b-rounded justify-content-center m-b-15" @click="updateBillingAddressFilters">
+                                <div class="col col-md-10 bg-master-lightest margin-auto padding-15">
+                                    <div class="row justify-content-center">
+                                        <div class="col pointer d-flex justtify-content-center align-items-center">
+                                            <i class="fa fs-30 fa-fw" :class="{'fa-square-o': !useDeliveryAddress, 'fa-check-square': useDeliveryAddress, 'text-primary':useDeliveryAddress}" ></i>
+                                            <p class="m-b-0">Use Delivery Address</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row justify-content-center m-b-15" v-if="error">
+                                <div class="col-10">
+                                    <small class="text-danger">{{error}}</small>
+                                </div>
+                            </div>
+                            <div class="row justify-content-center">
+                                <div class="col col-md-10">
+                                    <list-component :key="currentKey" style="min-height: 50px;" section="addressList" :emptyListSection=false :endpoint="route('api.address.list')" :options="billingAddressFilters">
+                                        <template slot="list" slot-scope="{data}">
+                                            <select-address-component :data="data" :value="parameters.billing_address_id" v-model="parameters.billing_address_id"></select-address-component>
+                                        </template>
+                                    </list-component>
+                                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                                        <div class="col b-a p-t-15 p-b-15 pointer" :class="{ 'b-primary': !parameters.billing_address_id, 'b-grey': parameters.billing_address_id}" @click="parameters.billing_address_id = null">
+                                            <div class="row align-items-center">
+                                                <div class="col-auto p-r-0">
+                                                    <i class="fa fs-20 p-t-5" :class="{'fa-circle-o': parameters.billing_address_id, 'fa-check-circle': !parameters.billing_address_id, 'text-primary': !parameters.billing_address_id}"></i>
+                                                </div>
+                                                <div class="col-auto semi-bold">New Address</div>
+                                            </div>
+                                            <div class="row" v-show="!parameters.billing_address_id">
+                                                <div class="col">
+                                                    <address-form-component :type="1" :id="company.company_module.id" section="addressList" @input="parameters.billing_address_id = $event"></address-form-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row justify-content-center animate__animated animate__fadeInUpBig animate__delay-1 animate__fast">
+                        <div class="col col-md-8 no-padding">
+                            <div class="row">
+                                <div class="col-auto p-r-5">
+                                    <button type="button" class="btn btn-lg btn-default b-rad-none" @click="chooseBillingAddress = !chooseBillingAddress">back</button>
+                                </div>
+                                <div class="col p-l-5">
+                                    <button type="button" class="btn btn-lg btn-block btn-primary b-rad-none" @click="createOrder()" v-if="parameters.billing_address_id">Create Order</button>
                                 </div>
                             </div>
                         </div>
@@ -172,11 +237,20 @@
             return {
                 section: 'createOrderForm',
                 step: 1,
+                currentKey: 1,
                 error: '',
+                chooseBillingAddress: false,
+                useDeliveryAddress: false,
+                billingAddressFilters: {
+                    per_page: 10, 
+                    HasMorphCompanyModule: this.company.company_module.id,
+                    type: 1
+                },
                 parameters : {
                     warehouse_id: '',
                     address_id: '',
                     company_id: this.company.id,
+                    billing_address_id: '',
                 }
             }
         },
@@ -205,6 +279,21 @@
                 alert(response.message)
                 this.error = response.message;
                 this.step--;
+            },
+            updateBillingAddressFilters(){
+                if(this.useDeliveryAddress) {
+                    // if use delivery address
+                    this.billingAddressFilters = {
+                        per_page: 10, 
+                        HasMorphCompanyModule: this.company.company_module.id,
+                        type: 1
+                    }
+                    this.parameters.billing_address_id = '';
+                } else {
+                    this.billingAddressFilters = {per_page: 10, HasMorphCompanyModule: this.company.company_module.id};
+                }
+                this.useDeliveryAddress = !this.useDeliveryAddress;
+                this.currentKey++;
             }
         }
     }