Updated delivery item order

Author: andrewdrake

resources/views/deliveries/partials/card-show.blade.php

@@ -86,7 +86,7 @@
                         <th scope="col">{{ ucfirst(__('laravel-crm::lang.quantity')) }}</th></tr>
                     </thead>
                     <tbody>
-                    @foreach($delivery->deliveryProducts()->where('quantity', '>', 0)->get() as $deliveryProduct)
+                    @foreach($delivery->deliveryProducts()->where('quantity', '>', 0)->orderBy('order', 'asc')->orderBy('created_at', 'asc')->get() as $deliveryProduct)
                         <tr>
                             <td>{{ $deliveryProduct->orderProduct->product->name }}</td>
                             <td>{{ $deliveryProduct->quantity }}</td></tr>

resources/views/deliveries/pdf.blade.php

@@ -98,7 +98,7 @@
         </tr>
         </thead>
         <tbody>
-        @foreach($delivery->deliveryProducts()->where('quantity', '>', 0)->get() as $deliveryProduct)
+        @foreach($delivery->deliveryProducts()->where('quantity', '>', 0)->orderBy('order', 'asc')->orderBy('created_at', 'asc')->get() as $deliveryProduct)
             <tr>
                 <td>{{ $deliveryProduct->orderProduct->product->name }}</td>
                 <td>{{ $deliveryProduct->quantity }}</td>

resources/views/delivery-products/partials/fields.blade.php

@@ -1,4 +1,8 @@
-<tr wire:key="select2-{{ $value }}" data-number="{{ $value }}" class="item-tr">
+<tr class="cursor-grab" id="{{ $value }}">
+    <td colspan="5" class="m-0 p-0">
+        <table class="table table-sm table-items mb-0">
+            <tbody>
+            <tr wire:key="select2-{{ $value }}" data-number="{{ $value }}" class="item-tr">
     <td class="pt-3 bind-select2" style="position: relative;">
         @include('laravel-crm::partials.form.hidden',[
           'name' => 'products['.$value.'][delivery_product_id]',
@@ -31,6 +35,7 @@
         </span>
         @if(!isset($fromOrder))
         <span style="position: absolute;top:13%; right: 5px;">
+            <button type="button" class="btn btn-link btn-sm"><span class="fa fa-arrows-v"></span></button>
             <button wire:click.prevent="remove({{ $value }})" type="button" class="btn btn-outline-danger btn-sm btn-close"><span class="fa fa-remove"></span></button>
         </span>
         @endif    
@@ -63,3 +68,7 @@
        @endif     
     </td>
 </tr>
+            </tbody>
+        </table>
+    </td>
+</tr>

resources/views/livewire/delivery-items.blade.php

@@ -15,7 +15,7 @@
                         <th scope="col" class="col-3 border-0">{{ ucfirst(__('laravel-crm::lang.amount')) }}</th>
                     </tr>
                 </thead>--}}
-                <tbody>
+               <tbody id="sortableItems">
                 @foreach($inputs as $key => $value)
                     @include('laravel-crm::delivery-products.partials.fields')
                 @endforeach
@@ -41,6 +41,22 @@
                     });
                 })*/
 
+                var el = document.getElementById('sortableItems');
+                var sortable = Sortable.create(el, {
+                    ghostClass: 'bg-secondary',
+                    dragClass: "bg-white",
+                    onEnd: function (evt) {
+                        const orderChanged = evt.oldIndex !== evt.newIndex;
+
+                        if (!orderChanged) {
+                            return;
+                        }
+
+                        const fromOrderedIds = [].slice.call(evt.from.children).map(child => child.id);
+                        @this.call('onItemSorted', fromOrderedIds);
+                    }
+                });
+
                 window.addEventListener('addedItem', event => {
                     $("tr[data-number='" + event.detail.id + "'] td.bind-select2 select[name^='products']").select2({
                         data: products,

src/Http/Livewire/LiveDeliveryItems.php

@@ -129,6 +129,14 @@ public function getRemainOrderQuantity($orderProduct)
         return $quantity;
     }
 
+    public function onItemSorted($orderedIds)
+    {
+        foreach ($orderedIds as $orderNumber => $i) {
+            $key = $orderNumber + 1;
+            $this->inputs[$orderNumber] = (int) $i;
+        }
+    }
+
     public function render()
     {
         return view('laravel-crm::livewire.delivery-items');