From 69f6c86aee8a2cccc997966b82934368b42b705c Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Sun, 2 Aug 2015 18:47:48 +0200 Subject: [PATCH] added instant delivery to gui / added RUC as abbr tag and details tag on mobile --- front-ui/app/components/cart/cartPage.js | 24 +++++++--- front-ui/app/components/cart/cartTotal.js | 10 ++-- front-ui/app/models/place.js | 15 +++--- front-ui/build/configured/ribica.bundle.js | 53 ++++++++++++++-------- 4 files changed, 66 insertions(+), 36 deletions(-) diff --git a/front-ui/app/components/cart/cartPage.js b/front-ui/app/components/cart/cartPage.js index fa0fa83..2eb7e0b 100644 --- a/front-ui/app/components/cart/cartPage.js +++ b/front-ui/app/components/cart/cartPage.js @@ -46,8 +46,8 @@ var CartPage = React.createClass({

-
- +
+
@@ -60,6 +60,12 @@ var CartPage = React.createClass({ ); + var instantDelivery = (
+ + {" Hitna dostava (ako naručite toku radnog dana do 16h) ili ujutru (ako naručite poslije 16h)"} +
); + var buySomethingMessage = (
); var content; @@ -91,6 +97,7 @@ var CartPage = React.createClass({ {buySomethingMessage} + {instantDelivery} {cartTotal} ) } @@ -133,9 +140,7 @@ var CartPage = React.createClass({ {i.get('name')}

- { Globals.FormatCurrency(price) } -
{ Globals.FormatPercentage(commission) } RUC
- + { Globals.FormatCurrency(price) }