Updated tax rates

Author: andrewdrake

resources/lang/en/lang.php

@@ -438,5 +438,6 @@
     'rate' => 'rate',
     'add_tax_rate' => 'add tax rate',
     'back_to_tax_rates' => 'back to tax rates',
-    'edit_tax_rate' => 'edit tax rate'
+    'edit_tax_rate' => 'edit tax rate',
+    'tax_rate_percent' => 'tax rate %'
 ];

resources/views/livewire/product-form.blade.php

@@ -0,0 +1,25 @@
+<div>
+   <div class="row">
+      <div class="col-sm-6">
+         @include('laravel-crm::partials.form.select',[
+               'name' => 'tax_rate_id',
+               'label' => ucfirst(__('laravel-crm::lang.tax_rate')),
+               'options' => ['' => ''] + \VentureDrake\LaravelCrm\Models\TaxRate::pluck('name', 'id')->toArray(),
+               'attributes' => [
+                'wire:model' => 'tax_rate_id'
+               ]
+           ])
+      </div>
+      <div class="col-sm-6">
+         @include('laravel-crm::partials.form.text',[
+               'name' => 'tax_rate',
+               'label' => ucfirst(__('laravel-crm::lang.tax_rate_percent')),
+               'append' => '<span class="fa fa-percent" aria-hidden="true"></span>',
+               'attributes' => [
+                   'wire:model' => 'tax_rate',
+                   'readonly' => 'readonly'
+               ]
+           ])
+      </div>
+   </div>
+</div>

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

@@ -44,9 +44,9 @@
                     <dd class="col-sm-9">{{ $product->sales_account }}</dd>
                     <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.unit')) }}</dt>
                     <dd class="col-sm-9">{{ $product->unit }}</dd>
-                    <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.tax')) }}</dt>
-                    <dd class="col-sm-9">{{ $product->taxRate->name }}</dd>
                     <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.tax_rate')) }}</dt>
+                    <dd class="col-sm-9">{{ $product->taxRate->name ?? null }}</dd>
+                    <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.tax_rate_percent')) }}</dt>
                     <dd class="col-sm-9">{{ $product->tax_rate ?? $product->taxRate->rate ?? 0 }}%</dd>
                     <dt class="col-sm-3 text-right">{{ ucfirst(__('laravel-crm::lang.category')) }}</dt>
                     <dd class="col-sm-9">{{ $product->productCategory->name ?? null }}</dd>

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

@@ -66,24 +66,9 @@
                  ])
             </div>
         </div>
-        <div class="row">
-            <div class="col-sm-6">
-                @include('laravel-crm::partials.form.select',[
-                      'name' => 'tax_rate_id',
-                      'label' => ucfirst(__('laravel-crm::lang.tax')),
-                      'options' => ['' => ''] + \VentureDrake\LaravelCrm\Models\TaxRate::pluck('name', 'id')->toArray(),
-                      'value' => old('tax_rate_id', (isset($product) ? $product->taxRate->id ?? null : null))
-                  ])
-            </div>
-            <div class="col-sm-6">
-                @include('laravel-crm::partials.form.text',[
-                      'name' => 'tax_rate',
-                      'label' => ucfirst(__('laravel-crm::lang.tax_rate')),
-                      'append' => '<span class="fa fa-percent" aria-hidden="true"></span>',
-                      'value' => old('tax_rate', $product->tax_rate ?? null)
-                  ])
-            </div>
-        </div>
+        @livewire('product-form',[
+            'product' => $product ?? null
+        ])
         <div class="row">
             <div class="col-sm-6">
                 @include('laravel-crm::partials.form.select',[

src/Http/Livewire/LiveProductForm.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace VentureDrake\LaravelCrm\Http\Livewire;
+
+use Livewire\Component;
+use VentureDrake\LaravelCrm\Models\TaxRate;
+use VentureDrake\LaravelCrm\Services\SettingService;
+
+class LiveProductForm extends Component
+{
+    private $settingService;
+    public $tax_rate_id;
+    public $tax_rate;
+
+    public function boot(SettingService $settingService)
+    {
+        $this->settingService = $settingService;
+    }
+
+    public function mount($product)
+    {
+        $this->tax_rate_id = old('tax_rate_id') ?? $product->taxRate->id ?? null;
+        $this->tax_rate = old('tax_rate') ??  $product->tax_rate ?? $product->taxRate->rate ?? null;
+    }
+
+    public function updatedTaxRateId($value)
+    {
+        if($value) {
+            $this->tax_rate = TaxRate::find($value)->rate;
+        } else {
+            $this->tax_rate = number_format($this->settingService->get('tax_rate')->value ?? 0, 2);
+        }
+    }
+
+    public function render()
+    {
+        return view('laravel-crm::livewire.product-form');
+    }
+}

src/LaravelCrmServiceProvider.php

@@ -46,6 +46,7 @@
 use VentureDrake\LaravelCrm\Http\Livewire\LiveOrderForm;
 use VentureDrake\LaravelCrm\Http\Livewire\LiveOrderItems;
 use VentureDrake\LaravelCrm\Http\Livewire\LivePhoneEdit;
+use VentureDrake\LaravelCrm\Http\Livewire\LiveProductForm;
 use VentureDrake\LaravelCrm\Http\Livewire\LiveQuoteForm;
 use VentureDrake\LaravelCrm\Http\Livewire\LiveQuoteItems;
 use VentureDrake\LaravelCrm\Http\Livewire\LiveRelatedContactOrganisation;
@@ -480,6 +481,7 @@ function ($perPage = 30, $page = null, $options = []) {
         Livewire::component('invoice-lines', LiveInvoiceLines::class);
         Livewire::component('send-invoice', SendInvoice::class);
         Livewire::component('pay-invoice', PayInvoice::class);
+        Livewire::component('product-form', LiveProductForm::class);
 
         if ($this->app->runningInConsole()) {
             $this->app->booted(function () {