senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fiddled around with css / numbers on two decimals now on product list

Browse Source
This commit is contained in:
Senad Uka
2015-06-06 21:50:41 +02:00
parent 763bc329fc
commit 771a71b42f
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
back-office/Gemfile.lock
View File

@@ -231,3 +231,6 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
BUNDLED WITH
1.10.3

3
back-office/import_validate.log
View File

@@ -7,3 +7,6 @@ I, [2015-05-13T06:59:46.065723 #35530] INFO -- : Import done
I, [2015-05-13T07:00:24.402397 #35642] INFO -- : Item import starting at 2015-05-13 07:00:24 +0200
I, [2015-05-13T07:00:24.402456 #35642] INFO -- : Will be importing items from /Users/senaduka/Downloads/items_for_import.csv
I, [2015-05-13T07:00:37.829898 #35642] INFO -- : Import done
I, [2015-06-06T08:06:52.737647 #7908] INFO -- : Item import starting at 2015-06-06 08:06:52 +0200
I, [2015-06-06T08:06:52.738405 #7908] INFO -- : Will be importing items from /home/senadu/Downloads/items_for_import - item_2015-03-21_06h31m33.csv.csv
I, [2015-06-06T08:06:59.910247 #7908] INFO -- : Import done

3
front-api/Gemfile.lock
View File

@@ -106,3 +106,6 @@ DEPENDENCIES
sinatra
sinatra-activerecord
sinatra-contrib
BUNDLED WITH
1.10.3

2
front-api/db/schema.rb
View File

@@ -129,8 +129,8 @@ ActiveRecord::Schema.define(version: 20150420044444) do
t.datetime "updated_at", null: false
t.string "tags"
t.json "traits"
t.decimal "weight", precision: 5, scale: 3
t.integer "supplier_id"
t.decimal "weight", precision: 5, scale: 3
t.integer "delivery_time_estimation_id"
t.integer "brand_id"
end

10
front-ui/app/components/items/singleItem.js
View File

@@ -1,8 +1,9 @@
var React = require('react');
var ItemActions = require('../../actions/itemActions');
var NavigationActions = require('../../actions/navigationActions');
var NavigationStore = require('../../stores/navigationStore')
var NavigationStore = require('../../stores/navigationStore');
var Globals = require('../../globals');
var Router = require('react-router');
var SingleItem = React.createClass({
@@ -19,7 +20,7 @@ var SingleItem = React.createClass({
<img className="img-responsive" src={firstImage.url} alt="product image" />
<div>
<p>{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }{ this.props.item.get('name') }</p>
<p> <p className="productbox item_brand_name">{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }</p>{ this.props.item.get('name') }</p>
</div>
</div>
@@ -33,8 +34,9 @@ var SingleItem = React.createClass({
<div className="productbox">
<img className="img-responsive" src={firstImage.resized_url} alt="product image" />
<div style={{height: "110px"}}>
<p>{ this.props.item.get('brand') ? this.props.item.get('brand').name : '' }{ this.props.item.get('name') }</p>
<h4>{ this.props.item.get('list_price') } KM </h4>
<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>
</div>
</div>