From a50ca5a32838d4a65c7a616d8a86e1bd8106347b Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 9 Mar 2017 11:33:55 +0200
Subject: [PATCH] Handle currency symbol when setting product cost

---
 app/Http/Controllers/ProductController.php   | 15 +++++++++------
 app/Ninja/Repositories/ProductRepository.php |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index daba96174e55..0661fb3750f1 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Product;
 use App\Models\TaxRate;
 use App\Ninja\Datatables\ProductDatatable;
+use App\Ninja\Repositories\ProductRepository;
 use App\Services\ProductService;
 use Auth;
 use Input;
@@ -24,16 +25,22 @@ class ProductController extends BaseController
      */
     protected $productService;
 
+    /**
+     * @var ProductRepository
+     */
+    protected $productRepo;
+
     /**
      * ProductController constructor.
      *
      * @param ProductService $productService
      */
-    public function __construct(ProductService $productService)
+    public function __construct(ProductService $productService, ProductRepository $productRepo)
     {
         //parent::__construct();
 
         $this->productService = $productService;
+        $this->productRepo = $productRepo;
     }
 
     /**
@@ -137,11 +144,7 @@ class ProductController extends BaseController
             $product = Product::createNew();
         }
 
-        $product->product_key = trim(Input::get('product_key'));
-        $product->notes = trim(Input::get('notes'));
-        $product->cost = trim(Input::get('cost'));
-        $product->fill(Input::all());
-        $product->save();
+        $this->productRepo->save(Input::all(), $product);
 
         $message = $productPublicId ? trans('texts.updated_product') : trans('texts.created_product');
         Session::flash('message', $message);
diff --git a/app/Ninja/Repositories/ProductRepository.php b/app/Ninja/Repositories/ProductRepository.php
index 3e01d885669b..5fe4322eb306 100644
--- a/app/Ninja/Repositories/ProductRepository.php
+++ b/app/Ninja/Repositories/ProductRepository.php
@@ -3,6 +3,7 @@
 namespace App\Ninja\Repositories;
 
 use App\Models\Product;
+use Utils;
 use DB;
 
 class ProductRepository extends BaseRepository
@@ -64,6 +65,9 @@ class ProductRepository extends BaseRepository
         }
 
         $product->fill($data);
+        $product->product_key = trim($data['product_key']);
+        $product->notes = trim($data['notes']);
+        $product->cost = Utils::parseFloat($data['cost']);
         $product->save();
 
         return $product;