From b93660b2645d6011f989f5467042bbcf2cb93d15 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Tue, 24 Nov 2015 10:29:46 +0100 Subject: [PATCH] added decoration support --- back-office/app/models/item.rb | 4 +++- .../db/migrate/20151124061357_add_decoration_to_item.rb | 5 +++++ front-api/db/schema.rb | 3 ++- front-api/models/multi_media_description.rb | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 front-api/db/migrate/20151124061357_add_decoration_to_item.rb diff --git a/back-office/app/models/item.rb b/back-office/app/models/item.rb index 0bb9ad1..c991c44 100644 --- a/back-office/app/models/item.rb +++ b/back-office/app/models/item.rb @@ -3,7 +3,8 @@ class Item < ActiveRecord::Base CSV_COL = { :code => 0, :input_price => 1, - :list_price => 2 + :list_price => 2, + :decoration => 3 } belongs_to :unit @@ -117,6 +118,7 @@ class Item < ActiveRecord::Base else item.current_input_price = row[CSV_COL[:input_price]] item.list_price = row[CSV_COL[:list_price]] + item.decoration = row[CSV_COL[:decoration]] item.save! end end diff --git a/front-api/db/migrate/20151124061357_add_decoration_to_item.rb b/front-api/db/migrate/20151124061357_add_decoration_to_item.rb new file mode 100644 index 0000000..290d34e --- /dev/null +++ b/front-api/db/migrate/20151124061357_add_decoration_to_item.rb @@ -0,0 +1,5 @@ +class AddDecorationToItem < ActiveRecord::Migration + def change + add_column :items, :decoration, :string + end +end diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb index 564e0b1..8c9037a 100644 --- a/front-api/db/schema.rb +++ b/front-api/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150726161256) do +ActiveRecord::Schema.define(version: 20151124061357) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -135,6 +135,7 @@ ActiveRecord::Schema.define(version: 20150726161256) do t.decimal "weight", precision: 5, scale: 3 t.integer "delivery_time_estimation_id" t.integer "brand_id" + t.string "decoration" end create_table "link_banners", force: :cascade do |t| diff --git a/front-api/models/multi_media_description.rb b/front-api/models/multi_media_description.rb index 2aa7aa3..4be8f03 100644 --- a/front-api/models/multi_media_description.rb +++ b/front-api/models/multi_media_description.rb @@ -8,7 +8,8 @@ class MultiMediaDescription < ActiveRecord::Base end def resized_url - url.gsub('/upload/v','/upload/c_lpad,h_281,w_375/v') + decoration_slug = item.decoration.present? ? "/#{item.decoration}" : "" + url.gsub('/upload/v',"/upload/c_lpad,h_281,w_375#{decoration_slug}/v") end end