Create & add another on PO created from orders

Author: andrewdrake

resources/views/purchase-order-lines/partials/fields.blade.php

@@ -55,7 +55,7 @@
     </td>
 </tr>
 @if($fromOrder)
-<tr data-number="{{ $value }}" class="item-tr">
+{{--<tr data-number="{{ $value }}" class="item-tr">
     <td colspan="5" class="border-0 pt-0 bind-select2-organisations" style="position: relative;">
         @include('laravel-crm::partials.form.select',[
             'name' => 'purchaseOrderLines['.$value.'][organisation_id]',
@@ -65,12 +65,12 @@
             ],
             'value' => $this->organisation_id[$value] ?? null,
             'attributes' => [
-                'wire:model' => 'organisation_idnpm .'.$value,
+                'wire:model' => 'organisation_id .'.$value,
                 'data-value' => $value
             ]
         ])
     </td>
-</tr>
+</tr>--}}
 @endif
 <tr data-number="{{ $value }}" class="item-tr">
     <td colspan="2" class="border-0 pt-0">
@@ -84,7 +84,7 @@
                        'wire:model' => 'price.'.$value,
                        'wire:change' => 'calculateAmounts',
                        'step' => .01,
-                        'readonly' => 'readonly'
+                       /* 'readonly' => 'readonly'*/
                    ]
                 ])
         @else
@@ -103,7 +103,7 @@
     </td>
     <td class="border-0 pt-0">
         @if($fromOrder)
-            @include('laravel-crm::partials.form.select',[
+            {{--@include('laravel-crm::partials.form.select',[
                'name' => 'purchaseOrderLines['.$value.'][quantity]',
                'label' => ucfirst(__('laravel-crm::lang.quantity')),
                'options' => $this->order_quantities[$value],
@@ -113,6 +113,15 @@
                    'data-value' => $value,
                    'wire:change' => 'calculateAmounts'
                ]
+           ])--}}
+            @include('laravel-crm::partials.form.text',[
+              'name' => 'purchaseOrderLines['.$value.'][quantity]',
+              'label' => ucfirst(__('laravel-crm::lang.quantity')),
+              'type' => 'number',
+              'attributes' => [
+                  'wire:model' => 'quantity.'.$value,
+                  'wire:change' => 'calculateAmounts'
+              ]
            ])
         @else
             @include('laravel-crm::partials.form.text',[
@@ -156,14 +165,21 @@
 <tr data-number="{{ $value }}" class="item-tr">
     <td colspan="5" class="border-0 pt-0 pb-4">
         @if($fromOrder)
-            @include('laravel-crm::partials.form.text',[
+           {{-- @include('laravel-crm::partials.form.text',[
                'name' => 'purchaseOrderLines['.$value.'][comments]',
                'label' => ucfirst(__('laravel-crm::lang.comments')),
                'attributes' => [
                    'wire:model' => 'comments.'.$value,
                     'readonly' => 'readonly'
                ]
-           ])
+           ])--}}
+            @include('laravel-crm::partials.form.text',[
+             'name' => 'purchaseOrderLines['.$value.'][comments]',
+             'label' => ucfirst(__('laravel-crm::lang.comments')),
+             'attributes' => [
+                 'wire:model' => 'comments.'.$value,
+             ]
+         ])
         @else    
             @include('laravel-crm::partials.form.text',[
                'name' => 'purchaseOrderLines['.$value.'][comments]',

resources/views/purchase-orders/partials/card-create.blade.php

@@ -1,7 +1,7 @@
 @if(empty($order))
 <form method="POST" action="{{ url(route('laravel-crm.purchase-orders.store')) }}">
 @else
-<form method="POST" action="{{ url(route('laravel-crm.purchase-orders.store-multiple')) }}">     
+<form method="POST" action="{{ url(route('laravel-crm.purchase-orders.store')) }}?order={{ $order->id }}">     
 @endif        
 
     @csrf
@@ -31,10 +31,8 @@
 
         @component('laravel-crm::components.card-footer')
                 <a href="{{ url(route('laravel-crm.purchase-orders.index')) }}" class="btn btn-outline-secondary">{{ ucfirst(__('laravel-crm::lang.cancel')) }}</a>
-{{--
-                <button type="submit" class="btn btn-primary">{{ ucfirst(__('laravel-crm::lang.create_and_add_another')) }}</button>
---}}
-                <button type="submit" class="btn btn-primary">{{ ucfirst(__('laravel-crm::lang.create_purchase_order')) }}</button>
+                <button type="submit" class="btn btn-primary" name="action" value="create_and_add_another">{{ ucfirst(__('laravel-crm::lang.create_and_add_another')) }}</button>
+                <button type="submit" class="btn btn-primary" name="action">{{ ucfirst(__('laravel-crm::lang.create_purchase_order')) }}</button>
         @endcomponent
 
     @endcomponent

resources/views/purchase-orders/partials/fields.blade.php

@@ -4,7 +4,6 @@
              'name' => 'order_id',
              'value' => old('order_id', $invoice->order->id ?? $order->id ?? null),
         ])
-        @empty($order)
         <span class="autocomplete">
              @include('laravel-crm::partials.form.hidden',[
                'name' => 'person_id',
@@ -43,7 +42,6 @@
                'required' => 'true'
             ])
         </span>
-        @endempty
         <div class="row">
             <div class="col-sm-6">
                 @include('laravel-crm::partials.form.text',[

src/Http/Controllers/PurchaseOrderController.php

@@ -137,6 +137,10 @@ public function store(StorePurchaseOrderRequest $request)
 
         flash(ucfirst(trans('laravel-crm::lang.purchase_order_created')))->success()->important();
 
+        if($request->action == 'create_and_add_another') {
+            return redirect(route('laravel-crm.purchase-orders.create', ['model' => 'order', 'id' => $request->order]));
+        }
+
         return redirect(route('laravel-crm.purchase-orders.index'));
     }
 

src/Http/Requests/StorePurchaseOrderRequest.php

@@ -32,10 +32,10 @@ public function rules()
             'currency' => 'required',
         ];
 
-        if (! request('order_id')) {
-            $rules['person_name'] = 'required_without:organisation_name|max:255';
-            $rules['organisation_name'] = 'required_without:person_name|max:255';
-        }
+        //if (! request('order_id')) {
+        $rules['person_name'] = 'required_without:organisation_name|max:255';
+        $rules['organisation_name'] = 'required_without:person_name|max:255';
+        //}
 
         if(request('delivery_type') == 'deliver') {
             $rules['delivery_address'] = 'required';