Updated creating delivery from an order

andrewdrake · andrewdrake · commit 03a58a8370f2 · 2023-05-22T22:07:16.000+10:00
diff --git a/database/migrations/add_quantity_to_laravel_crm_delivery_products_table.php.stub b/database/migrations/add_quantity_to_laravel_crm_delivery_products_table.php.stub
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddQuantityToLaravelCrmDeliveryProductsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'delivery_products', function (Blueprint $table) {
+            $table->integer('quantity')->nullable()->after('order_product_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'delivery_products', function (Blueprint $table) {
+            $table->dropColumn([
+                'quantity',
+            ]);
+        });
+    }
+}
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
@@ -421,5 +421,5 @@
     'order_number' => 'order number',
     'quote_number' => 'quote number',
     'from_quote' => 'from quote',
-    'from_order' => 'from order'
+    'from_order' => 'from order',
 ];
diff --git a/resources/views/deliveries/partials/card-show.blade.php b/resources/views/deliveries/partials/card-show.blade.php
@@ -77,19 +77,13 @@
                     <thead>
                     <tr>
                         <th scope="col">{{ ucfirst(__('laravel-crm::lang.item')) }}</th>
-                        <th scope="col">{{ ucfirst(__('laravel-crm::lang.price')) }}</th>
-                        <th scope="col">{{ ucfirst(__('laravel-crm::lang.quantity')) }}</th>
-                        <th scope="col">{{ ucfirst(__('laravel-crm::lang.amount')) }}</th>
-                    </tr>
+                        <th scope="col">{{ ucfirst(__('laravel-crm::lang.quantity')) }}</th></tr>
                     </thead>
                     <tbody>
                     @foreach($delivery->deliveryProducts()->get() as $deliveryProduct)
                         <tr>
                             <td>{{ $deliveryProduct->orderProduct->product->name }}</td>
-                            <td>{{ money($deliveryProduct->orderProduct->price ?? null, $deliveryProduct->orderProduct->currency) }}</td>
-                            <td>{{ $deliveryProduct->orderProduct->quantity }}</td>
-                            <td>{{ money($deliveryProduct->orderProduct->amount ?? null, $deliveryProduct->orderProduct->currency) }}</td>
-                        </tr>
+                            <td>{{ $deliveryProduct->quantity }}</td></tr>
                         @if($deliveryProduct->orderProduct->comments)
                             <tr>
                                 <td colspan="4" class="b-0 pt-0">
diff --git a/resources/views/deliveries/partials/fields.blade.php b/resources/views/deliveries/partials/fields.blade.php
@@ -1,5 +1,10 @@
 <div class="row">
     <div class="col-sm-5 border-right">
+        @include('laravel-crm::partials.form.hidden',[
+             'name' => 'order_id',
+             'value' => old('order_id', $delivery->order->id ?? $order->id ?? null),
+        ])
+        
         <div class="row">
             <div class="col-sm-6">
                 @include('laravel-crm::partials.form.text',[
diff --git a/resources/views/delivery-products/partials/fields.blade.php b/resources/views/delivery-products/partials/fields.blade.php
@@ -64,7 +64,6 @@
                 'attributes' => [
                     'wire:model' => 'quantity.'.$value,
                     'data-value' => $value,
-                    'wire:change' => 'calculateAmounts'
                 ]
             ])
         @else    
diff --git a/resources/views/orders/partials/card-index.blade.php b/resources/views/orders/partials/card-index.blade.php
@@ -97,10 +97,8 @@
                             @else
                                 <a href="{{ route('laravel-crm.invoices.show',$order->invoices()->first()) }}" class="btn btn-outline-secondary btn-sm">{{ ucwords(__('laravel-crm::lang.invoiced')) }}</a>
                             @endif
-                            @if($order->deliveries()->count() < 1) 
+                            @if(! $order->deliveryComplete()) 
                                 <a href="{{ route('laravel-crm.deliveries.create',['model' => 'order', 'id' => $order->id]) }}" class="btn btn-success btn-sm">{{ ucwords(__('laravel-crm::lang.create_delivery')) }}</a>
-                            @else
-                                <a href="{{ route('laravel-crm.deliveries.show',$order->deliveries()->first()) }}" class="btn btn-outline-secondary btn-sm">{{ ucwords(__('laravel-crm::lang.delivered')) }}</a>
                             @endif
                         @endcan
                         @can('view crm orders')
diff --git a/resources/views/orders/partials/card-show.blade.php b/resources/views/orders/partials/card-show.blade.php
@@ -18,10 +18,8 @@
                     @else
                         <a href="{{ route('laravel-crm.invoices.show',$order->invoices()->first()) }}" class="btn btn-outline-secondary btn-sm">{{ ucwords(__('laravel-crm::lang.invoiced')) }}</a>
                     @endif
-                    @if($order->deliveries()->count() < 1)
-                        <a href="{{ route('laravel-crm.orders.create-delivery',$order) }}" class="btn btn-success btn-sm">{{ ucwords(__('laravel-crm::lang.create_delivery')) }}</a>
-                    @else
-                        <a href="{{ route('laravel-crm.deliveries.show',$order->deliveries()->first()) }}" class="btn btn-outline-secondary btn-sm">{{ ucwords(__('laravel-crm::lang.delivered')) }}</a>
+                    @if(! $order->deliveryComplete())
+                        <a href="{{ route('laravel-crm.deliveries.create',['model' => 'order', 'id' => $order->id]) }}" class="btn btn-success btn-sm">{{ ucwords(__('laravel-crm::lang.create_delivery')) }}</a>
                     @endif
                 @endcan
                 @can('view crm orders')
diff --git a/src/Http/Controllers/DeliveryController.php b/src/Http/Controllers/DeliveryController.php
@@ -11,7 +11,6 @@
 use VentureDrake\LaravelCrm\Models\Order;
 use VentureDrake\LaravelCrm\Models\Organisation;
 use VentureDrake\LaravelCrm\Models\Person;
-use VentureDrake\LaravelCrm\Models\Quote;
 use VentureDrake\LaravelCrm\Services\DeliveryService;
 use VentureDrake\LaravelCrm\Services\OrganisationService;
 use VentureDrake\LaravelCrm\Services\PersonService;
diff --git a/src/Http/Controllers/QuoteController.php b/src/Http/Controllers/QuoteController.php
@@ -7,7 +7,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use Ramsey\Uuid\Uuid;
 use VentureDrake\LaravelCrm\Http\Requests\StoreQuoteRequest;
 use VentureDrake\LaravelCrm\Http\Requests\UpdateQuoteRequest;
 use VentureDrake\LaravelCrm\Models\Client;
diff --git a/src/Http/Livewire/LiveDeliveryItems.php b/src/Http/Livewire/LiveDeliveryItems.php
@@ -80,7 +80,7 @@ public function mount($delivery, $products, $old = null, $fromOrder = false)
                     }
                 }
             }
-        } elseif(! $this->fromOrder) {
+        } elseif (! $this->fromOrder) {
             $this->add($this->i);
         }
     }
diff --git a/src/Http/Livewire/LiveOrderItems.php b/src/Http/Livewire/LiveOrderItems.php
@@ -104,7 +104,7 @@ public function mount($order, $products, $old = null, $fromQuote = false)
                 $this->amount[$this->i] = $orderProduct->amount / 100;
                 $this->comments[$this->i] = $orderProduct->comments;
             }
-        } elseif(! $this->fromQuote) {
+        } elseif (! $this->fromQuote) {
             $this->add($this->i);
         }
 
diff --git a/src/LaravelCrmServiceProvider.php b/src/LaravelCrmServiceProvider.php
@@ -398,6 +398,7 @@ function ($perPage = 30, $page = null, $options = []) {
                 __DIR__ . '/../database/migrations/add_prefix_to_laravel_crm_quotes_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_prefix_to_laravel_crm_quotes_table.php', 76),
                 __DIR__ . '/../database/migrations/add_prefix_to_laravel_crm_orders_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_prefix_to_laravel_crm_orders_table.php', 77),
                 __DIR__ . '/../database/migrations/add_quote_product_id_to_laravel_crm_order_products_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_quote_product_id_to_laravel_crm_order_products_table.php', 78),
+                __DIR__ . '/../database/migrations/add_quantity_to_laravel_crm_delivery_products_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_quantity_to_laravel_crm_delivery_products_table.php', 79),
             ], 'migrations');
 
             // Publishing the seeders
diff --git a/src/Models/Order.php b/src/Models/Order.php
@@ -202,4 +202,23 @@ public function getShippingAddress()
     {
         return $this->addresses()->where('address_type_id', 6)->first();
     }
+    
+    public function deliveryComplete()
+    {
+        foreach ($this->orderProducts as $orderProduct) {
+            $quantity = $orderProduct->quantity;
+
+            foreach ($this->deliveries as $delivery) {
+                if ($deliveryProduct = $delivery->deliveryProducts()->where('order_product_id', $orderProduct->id)->first()) {
+                    $quantity -= $deliveryProduct->quantity;
+                }
+            }
+
+            if ($quantity > 0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,6 @@`
`64`	`64`	`'attributes' => [`
`65`	`65`	`'wire:model' => 'quantity.'.$value,`
`66`	`66`	`'data-value' => $value,`
`67`		`- 'wire:change' => 'calculateAmounts'`
`68`	`67`	`]`
`69`	`68`	`])`
`70`	`69`	`@else`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public function mount($delivery, $products, $old = null, $fromOrder = false)`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`	`}`
`83`		`- } elseif(! $this->fromOrder) {`
	`83`	`+ } elseif (! $this->fromOrder) {`
`84`	`84`	`$this->add($this->i);`
`85`	`85`	`}`
`86`	`86`	`}`