From c27e08a6823da405f6b2f59745322447c0bd9c5c Mon Sep 17 00:00:00 2001
From: Senad Uka <senaduka@gmail.com>
Date: Sat, 13 Jun 2015 03:28:16 +0200
Subject: [PATCH] price on item page is now with two decimals

---
 front-ui/app/components/items/itemWithDetailsPage.js | 3 ++-
 front-ui/app/components/items/singleItem.js          | 6 +++---
 front-ui/app/css/items.css                           | 5 +++++
 front-ui/app/css/main.css                            | 2 +-
 front-ui/app/models/itemWithDetails.js               | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/front-ui/app/components/items/itemWithDetailsPage.js b/front-ui/app/components/items/itemWithDetailsPage.js
index 94e664c..ee773ef 100644
--- a/front-ui/app/components/items/itemWithDetailsPage.js
+++ b/front-ui/app/components/items/itemWithDetailsPage.js
@@ -7,6 +7,7 @@ var React = require('react'),
     AddToCart = require('../cart/addToCart');
 
 var Router = require('react-router');
+var Globals = require('../../globals');
 
 
 var ItemWithDetailsPage = React.createClass({
@@ -24,7 +25,7 @@ var ItemWithDetailsPage = React.createClass({
            <div className='item_brand_name'> {this.state.item.get('brand').name}</div>
             <div className='item_name'> {this.state.item.get('name')}</div>
             <div>
-             <div className='item_price'> {this.state.item.get('list_price')} KM</div>
+             <div className='item_price'> {Globals.FormatCurrency(this.state.item.get('list_price'))}</div>
 
              <div>Količina</div>
 
diff --git a/front-ui/app/components/items/singleItem.js b/front-ui/app/components/items/singleItem.js
index 16a83ca..25d9070 100644
--- a/front-ui/app/components/items/singleItem.js
+++ b/front-ui/app/components/items/singleItem.js
@@ -33,8 +33,8 @@ var SingleItem = React.createClass({
          <div className="col-lg-3 col-md-3 col-sm-4 col-xs-6"  onClick={itemClick}>
           <div className="productbox">
             <img className="img-responsive" src={firstImage.resized_url} alt="product image" />
-              <div style={{height: "110px"}}>
-               <p> <span className="text-uppercase">{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }</span>
+              <div style={{height: "110px"}} className="item_name_and_price">
+               <p><span className="text-uppercase">{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }</span>
                <br /><span className="text-capitalize">{ this.props.item.get('name') }</span></p>
               <h4>{ Globals.FormatCurrency(this.props.item.get('list_price')) }</h4>
               </div>
@@ -42,7 +42,7 @@ var SingleItem = React.createClass({
         </div>
         );
       }
-    },
+    },    
 
     itemClick: function(e) {
       NavigationActions.goToItemDetails(this.props.item);
diff --git a/front-ui/app/css/items.css b/front-ui/app/css/items.css
index 4023d1f..6746647 100644
--- a/front-ui/app/css/items.css
+++ b/front-ui/app/css/items.css
@@ -58,6 +58,11 @@
 }
 
 
+.item_name_and_price {
+	text-align: center;
+	vertical-align: center;
+}
+
 
 
 /*   
diff --git a/front-ui/app/css/main.css b/front-ui/app/css/main.css
index 7f36bfb..c51d4f6 100644
--- a/front-ui/app/css/main.css
+++ b/front-ui/app/css/main.css
@@ -164,7 +164,7 @@ text-decoration: underline;
 }
 .productbox div span{
 color: black;
-margin-left: 8px;
+
 
 
 }
diff --git a/front-ui/app/models/itemWithDetails.js b/front-ui/app/models/itemWithDetails.js
index 56648fa..9e7d52b 100644
--- a/front-ui/app/models/itemWithDetails.js
+++ b/front-ui/app/models/itemWithDetails.js
@@ -13,7 +13,7 @@ var ItemWithDetails = Backbone.Model.extend({
             var price = parseFloat(this.get('list_price')).toFixed(2)
             var pricePerUnit = (price / unitsInPack).toFixed(2);
             var descriptionSuffix = this.get('unit').description_suffix;
-            return (+pricePerUnit).toString() + " KM " + descriptionSuffix;
+            return Globals.FormatCurrency(pricePerUnit); 
         }
     },
     defaults : {