refs #273 change solution system

app/Http/Controllers/Banking/Transfers.php

@@ -123,9 +123,9 @@ public function store(Request $request)
             'company_id' => $request['company_id'],
             'account_id' => $request['from_account_id'],
             'paid_at' => $request['transferred_at'],
-            'amount' => $request['amount'],
             'currency_code' => $payment_currency_code,
             'currency_rate' => $currencies[$payment_currency_code],
+            'amount' => $request['amount'],
             'vendor_id' => 0,
             'description' => $request['description'],
             'category_id' => Category::transfer(), // Transfer Category ID
@@ -153,9 +153,9 @@ public function store(Request $request)
             'company_id' => $request['company_id'],
             'account_id' => $request['to_account_id'],
             'paid_at' => $request['transferred_at'],
-            'amount' => $amount,
             'currency_code' => $revenue_currency_code,
             'currency_rate' => $currencies[$revenue_currency_code],
+            'amount' => $amount,
             'customer_id' => 0,
             'description' => $request['description'],
             'category_id' => Category::transfer(), // Transfer Category ID
@@ -229,9 +229,9 @@ public function update(Transfer $transfer, Request $request)
             'company_id' => $request['company_id'],
             'account_id' => $request['from_account_id'],
             'paid_at' => $request['transferred_at'],
-            'amount' => $request['amount'],
             'currency_code' => $payment_currency_code,
             'currency_rate' => $currencies[$payment_currency_code],
+            'amount' => $request['amount'],
             'vendor_id' => 0,
             'description' => $request['description'],
             'category_id' => Category::transfer(), // Transfer Category ID
@@ -259,9 +259,9 @@ public function update(Transfer $transfer, Request $request)
             'company_id' => $request['company_id'],
             'account_id' => $request['to_account_id'],
             'paid_at' => $request['transferred_at'],
-            'amount' => $amount,
             'currency_code' => $revenue_currency_code,
             'currency_rate' => $currencies[$revenue_currency_code],
+            'amount' => $amount,
             'customer_id' => 0,
             'description' => $request['description'],
             'category_id' => Category::transfer(), // Transfer Category ID

app/Http/Kernel.php

@@ -91,10 +91,5 @@ class Kernel extends HttpKernel
         'install' => \App\Http\Middleware\CanInstall::class,
         'company.settings' => \App\Http\Middleware\LoadSettings::class,
         'company.currencies' => \App\Http\Middleware\LoadCurrencies::class,
-        'bill.dateformat' => \App\Http\Middleware\BillDateFormat::class,
-        'invoice.dateformat' => \App\Http\Middleware\InvoiceDateFormat::class,
-        'payment.dateformat' => \App\Http\Middleware\PaymentDateFormat::class,
-        'revenue.dateformat' => \App\Http\Middleware\RevenueDateFormat::class,
-        'transfer.dateformat' => \App\Http\Middleware\TransferDateFormat::class,
     ];
 }

app/Models/Expense/Bill.php

@@ -158,6 +158,28 @@ public function setCurrencyRateAttribute($value)
         $this->attributes['currency_rate'] = (double) $value;
     }
 
+    /**
+     * Convert billed_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setBilledAtAttribute($value)
+    {
+        $this->attributes['billed_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
+    /**
+     * Convert due_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setDueAtAttribute($value)
+    {
+        $this->attributes['due_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     /**
      * Get the current balance.
      *

app/Models/Expense/BillPayment.php

@@ -85,6 +85,17 @@ public function scopePaid($query)
         return $query->sum('amount');
     }
 
+    /**
+     * Convert paid_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setPaidAtAttribute($value)
+    {
+        $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     /**
      * Get the current balance.
      *

app/Models/Expense/Payment.php

@@ -131,6 +131,17 @@ public static function scopeLatest($query)
         return $query->orderBy('paid_at', 'desc');
     }
 
+    /**
+     * Convert paid_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setPaidAtAttribute($value)
+    {
+        $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     /**
      * Get the current balance.
      *

app/Models/Income/Invoice.php

@@ -160,6 +160,28 @@ public function setCurrencyRateAttribute($value)
         $this->attributes['currency_rate'] = (double) $value;
     }
 
+    /**
+     * Convert invoiced_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setInvoicedAtAttribute($value)
+    {
+        $this->attributes['invoiced_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
+    /**
+     * Convert due_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setDueAtAttribute($value)
+    {
+        $this->attributes['due_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     /**
      * Get the current balance.
      *

app/Models/Income/InvoicePayment.php

@@ -85,6 +85,17 @@ public function scopePaid($query)
         return $query->sum('amount');
     }
 
+    /**
+     * Convert paid_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setPaidAtAttribute($value)
+    {
+        $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     /**
      * Get the current balance.
      *

app/Models/Income/Revenue.php

@@ -132,6 +132,17 @@ public function setCurrencyRateAttribute($value)
         $this->attributes['currency_rate'] = (double) $value;
     }
 
+    /**
+     * Convert paid_at to datetime.
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function setPaidAtAttribute($value)
+    {
+        $this->attributes['paid_at'] = $value . ' ' . Date::now()->format('H:i:s');
+    }
+
     public function scopeLatest($query)
     {
         return $query->orderBy('paid_at', 'desc');