From 15a75f014a8eb7faee1dcccaf91ad2c971bb429b Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Mon, 26 Dec 2016 20:58:17 +0500 Subject: [PATCH 01/14] Update readme for this fork --- README.markdown | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/README.markdown b/README.markdown index 3329e732..e006a586 100644 --- a/README.markdown +++ b/README.markdown @@ -1,17 +1,23 @@ # Product Assembly -[![Build Status](https://travis-ci.org/spree-contrib/spree-product-assembly.svg?branch=master)](https://travis-ci.org/spree-contrib/spree-product-assembly) -[![Code Climate](https://codeclimate.com/github/spree-contrib/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) +[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=master)](https://travis-ci.org/r72cccp/spree-product-assembly) +[![Code Climate](https://codeclimate.com/github/r72cccp/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) Create a product which is composed of other products. --- +## About Fork + +After installing this gem to rails 4.2.6 and spree 3.0 i'd see - it work not so as it is described. Try to repair functionality. + +--- + ## Installation Add the following line to your `Gemfile` ```ruby -gem 'spree_product_assembly', github: 'spree-contrib/spree-product-assembly', branch: 'master' +gem 'spree_product_assembly', github: 'r72cccp/spree-product-assembly', branch: 'master' ``` Run bundle install as well as the extension install command to copy and run migrations and append spree_product_assembly to your JS manifest file. From 506b6ea53eddbb282a91e059de058b8d72d4c87e Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Mon, 26 Dec 2016 21:14:12 +0500 Subject: [PATCH 02/14] add fixes - try to pass a travis.ci --- .travis.yml | 3 +-- spree_product_assembly.gemspec | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 246742e7..e25f3df4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,4 @@ before_script: script: - bundle exec rspec spec rvm: - - 2.1 - - 2.2 + - 2.2.2 diff --git a/spree_product_assembly.gemspec b/spree_product_assembly.gemspec index c2aa6969..be39a70d 100644 --- a/spree_product_assembly.gemspec +++ b/spree_product_assembly.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'launchy' s.add_development_dependency 'pg' s.add_development_dependency 'poltergeist', '~> 1.6' - s.add_development_dependency 'rspec-rails', '~> 3.3.0' + s.add_development_dependency 'rspec-rails', '~> 3.5.2' s.add_development_dependency 'sass-rails', '~> 5.0.0' s.add_development_dependency 'simplecov' s.add_development_dependency 'sqlite3' From 20e5875e6344b52e85a0551254af5cbdc482e2cd Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 00:18:27 +0500 Subject: [PATCH 03/14] update dependencies for pass a travis.ci --- README.markdown | 6 +++--- spree_product_assembly.gemspec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index e006a586..7e8ef55d 100644 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,6 @@ # Product Assembly -[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=master)](https://travis-ci.org/r72cccp/spree-product-assembly) -[![Code Climate](https://codeclimate.com/github/r72cccp/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) +[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=3-0-stable)](https://travis-ci.org/r72cccp/spree-product-assembly) Create a product which is composed of other products. @@ -9,6 +8,7 @@ Create a product which is composed of other products. ## About Fork +All changes only in 3-0-stable branch and for spree 3.0.x After installing this gem to rails 4.2.6 and spree 3.0 i'd see - it work not so as it is described. Try to repair functionality. --- @@ -17,7 +17,7 @@ After installing this gem to rails 4.2.6 and spree 3.0 i'd see - it work not so Add the following line to your `Gemfile` ```ruby -gem 'spree_product_assembly', github: 'r72cccp/spree-product-assembly', branch: 'master' +gem 'spree_product_assembly', github: 'r72cccp/spree-product-assembly', branch: '3-0-stable' ``` Run bundle install as well as the extension install command to copy and run migrations and append spree_product_assembly to your JS manifest file. diff --git a/spree_product_assembly.gemspec b/spree_product_assembly.gemspec index be39a70d..79871282 100644 --- a/spree_product_assembly.gemspec +++ b/spree_product_assembly.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'ffaker' s.add_development_dependency 'launchy' s.add_development_dependency 'pg' - s.add_development_dependency 'poltergeist', '~> 1.6' + s.add_development_dependency 'poltergeist', '~> 1.12.0' s.add_development_dependency 'rspec-rails', '~> 3.5.2' s.add_development_dependency 'sass-rails', '~> 5.0.0' s.add_development_dependency 'simplecov' From e484f4c2579fee4c9656509eb80c70324b4908d6 Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 00:52:43 +0500 Subject: [PATCH 04/14] Fix error, which arrive when run travis-ci: created a dummy app haven't all string in config/initializers/assets.rb --- .travis.yml | 1 + .../spree/admin/products/_product_assembly_fields.html.erb | 6 +++--- config/locales/ru.yml | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e25f3df4..208ced21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ before_script: - sh -e /etc/init.d/xvfb start - export DISPLAY=:99.0 - bundle exec rake test_app + - echo 'Rails.application.config.assets.precompile += %w( spinner.gif )' > spec/dummy/config/initializers/assets.rb script: - bundle exec rspec spec rvm: diff --git a/app/views/spree/admin/products/_product_assembly_fields.html.erb b/app/views/spree/admin/products/_product_assembly_fields.html.erb index dcd70f98..7986facc 100644 --- a/app/views/spree/admin/products/_product_assembly_fields.html.erb +++ b/app/views/spree/admin/products/_product_assembly_fields.html.erb @@ -1,6 +1,6 @@
<%= f.field_container :can_be_part, class: ['form-group'] do %> - <%= f.label :can_be_part %> + <%= f.label Spree.t('.can_be_part') %> <%= f.error_message_on :can_be_part %> <%= f.check_box :can_be_part, class: 'form-control' %> <% end %> @@ -8,7 +8,7 @@
<%= f.field_container :individual_sale, class: ['form-group'] do %> - <%= f.label :individual_sale %> + <%= f.label Spree.t('.individual_sale') %> <%= f.error_message_on :individual_sale %> <%= f.check_box :individual_sale, class: 'form-control' %> <% end %> @@ -23,4 +23,4 @@ }); <% end %> -<% end %> \ No newline at end of file +<% end %> diff --git a/config/locales/ru.yml b/config/locales/ru.yml index f3065587..e18134cc 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1,6 +1,11 @@ --- ru: spree: + admin: + products: + form: + can_be_part: Может быть частью набора + individual_sale: Может продаваться отдельно available_parts: Доступные составные части can_be_part: Может входить в состав других продуктов individual_sale: Может продаваться отдельно From 0fbcb9cd9998a34732b35d72c9436225301492e9 Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 02:47:50 +0500 Subject: [PATCH 05/14] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20spinner-gif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 208ced21..c1a23f1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_script: - sh -e /etc/init.d/xvfb start - export DISPLAY=:99.0 - bundle exec rake test_app - - echo 'Rails.application.config.assets.precompile += %w( spinner.gif )' > spec/dummy/config/initializers/assets.rb + - echo 'Rails.application.config.assets.precompile += %w( spinner.gif )' >> spec/dummy/config/initializers/assets.rb script: - bundle exec rspec spec rvm: From bb5a3115060d8df7357e5c523e83c24a5abdadb1 Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 04:20:40 +0500 Subject: [PATCH 06/14] Modify parts index form --- .../spree/backend/spree_product_assembly/index.js.coffee | 4 ++++ app/views/spree/admin/parts/index.html.erb | 4 ++-- config/locales/ru.yml | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee index d1459f78..09c6f2d1 100644 --- a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee +++ b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee @@ -1,6 +1,7 @@ #= require ./translations $(document).ready -> + console.log 'it\'s work' Spree.routes.available_admin_product_parts = (productSlug) -> Spree.pathFor("admin/products/" + productSlug + "/parts/available") @@ -34,6 +35,9 @@ $(document).ready -> $("#search_parts_button").click (e) -> e.preventDefault() + e.stopPropagation() + console.log + pressed: e.target searchForParts() makePostRequest = (link, post_params = {}) -> diff --git a/app/views/spree/admin/parts/index.html.erb b/app/views/spree/admin/parts/index.html.erb index 707f6653..727cee4c 100644 --- a/app/views/spree/admin/parts/index.html.erb +++ b/app/views/spree/admin/parts/index.html.erb @@ -14,8 +14,8 @@
-
diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e18134cc..7779fec2 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -2,6 +2,9 @@ ru: spree: admin: + parts: + index: + search: Поиск products: form: can_be_part: Может быть частью набора From 1d29977ede54d31f7914d7cd3a528e1bb75a76d0 Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 05:16:20 +0500 Subject: [PATCH 07/14] fix translations --- .../spree/backend/spree_product_assembly/index.js.coffee | 1 - config/locales/ru.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee index 09c6f2d1..1c294ce1 100644 --- a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee +++ b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee @@ -1,7 +1,6 @@ #= require ./translations $(document).ready -> - console.log 'it\'s work' Spree.routes.available_admin_product_parts = (productSlug) -> Spree.pathFor("admin/products/" + productSlug + "/parts/available") diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 7779fec2..ded01a2e 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -19,4 +19,4 @@ ru: parts_included: 'Детали, входящие' part_of_bundle: 'Часть пучка %{sku}' selected_quantity_not_available: - user_selectable: + user_selectable: Выбирается пользователем From c0d1a86c8596bbb13592c869e6ed756d00579855 Mon Sep 17 00:00:00 2001 From: Sergeij Belevskij Date: Tue, 27 Dec 2016 05:21:08 +0500 Subject: [PATCH 08/14] fix monstrous size of checkboxes --- .../spree/admin/products/_product_assembly_fields.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/spree/admin/products/_product_assembly_fields.html.erb b/app/views/spree/admin/products/_product_assembly_fields.html.erb index 7986facc..dcfdc1a1 100644 --- a/app/views/spree/admin/products/_product_assembly_fields.html.erb +++ b/app/views/spree/admin/products/_product_assembly_fields.html.erb @@ -2,7 +2,7 @@ <%= f.field_container :can_be_part, class: ['form-group'] do %> <%= f.label Spree.t('.can_be_part') %> <%= f.error_message_on :can_be_part %> - <%= f.check_box :can_be_part, class: 'form-control' %> + <%= f.check_box :can_be_part %> <% end %>
@@ -10,7 +10,7 @@ <%= f.field_container :individual_sale, class: ['form-group'] do %> <%= f.label Spree.t('.individual_sale') %> <%= f.error_message_on :individual_sale %> - <%= f.check_box :individual_sale, class: 'form-control' %> + <%= f.check_box :individual_sale %> <% end %>
From 638bffe08985b9b8efdd7e8a04a656a8293feb0b Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:28:04 +0500 Subject: [PATCH 09/14] Update README.markdown --- README.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 7e8ef55d..dffcf29d 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,7 @@ # Product Assembly -[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=3-0-stable)](https://travis-ci.org/r72cccp/spree-product-assembly) +[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=master)](https://travis-ci.org/r72cccp/spree-product-assembly) +[![Code Climate](https://codeclimate.com/github/r72cccp/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) Create a product which is composed of other products. From 251bedec367a159f054fbbe619cfa0ef172ee4e8 Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:28:38 +0500 Subject: [PATCH 10/14] Update README.markdown --- README.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.markdown b/README.markdown index dffcf29d..f5723dea 100644 --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,7 @@ # Product Assembly -[![Build Status](https://travis-ci.org/r72cccp/spree-product-assembly.svg?branch=master)](https://travis-ci.org/r72cccp/spree-product-assembly) -[![Code Climate](https://codeclimate.com/github/r72cccp/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) +[![Build Status](https://travis-ci.org/spree-contrib/spree-product-assembly.svg?branch=master)](https://travis-ci.org/spree-contrib/spree-product-assembly) +[![Code Climate](https://codeclimate.com/github/spree-contrib/spree-product-assembly/badges/gpa.svg)](https://codeclimate.com/github/spree-contrib/spree-product-assembly) Create a product which is composed of other products. From 7846ff67a887e14ff2f73cb3cf6fef220a8dd226 Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:29:00 +0500 Subject: [PATCH 11/14] Update README.markdown --- README.markdown | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.markdown b/README.markdown index f5723dea..a630c5f1 100644 --- a/README.markdown +++ b/README.markdown @@ -7,13 +7,6 @@ Create a product which is composed of other products. --- -## About Fork - -All changes only in 3-0-stable branch and for spree 3.0.x -After installing this gem to rails 4.2.6 and spree 3.0 i'd see - it work not so as it is described. Try to repair functionality. - ---- - ## Installation Add the following line to your `Gemfile` From b0abeb34e8405f33327d5573bfe60f525203b875 Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:29:39 +0500 Subject: [PATCH 12/14] Update index.js.coffee --- .../spree/backend/spree_product_assembly/index.js.coffee | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee index 1c294ce1..d1459f78 100644 --- a/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee +++ b/app/assets/javascripts/spree/backend/spree_product_assembly/index.js.coffee @@ -34,9 +34,6 @@ $(document).ready -> $("#search_parts_button").click (e) -> e.preventDefault() - e.stopPropagation() - console.log - pressed: e.target searchForParts() makePostRequest = (link, post_params = {}) -> From 012478d07635c2008611e55752b9af640f4e83c2 Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:30:13 +0500 Subject: [PATCH 13/14] Update README.markdown --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index a630c5f1..3329e732 100644 --- a/README.markdown +++ b/README.markdown @@ -11,7 +11,7 @@ Create a product which is composed of other products. Add the following line to your `Gemfile` ```ruby -gem 'spree_product_assembly', github: 'r72cccp/spree-product-assembly', branch: '3-0-stable' +gem 'spree_product_assembly', github: 'spree-contrib/spree-product-assembly', branch: 'master' ``` Run bundle install as well as the extension install command to copy and run migrations and append spree_product_assembly to your JS manifest file. From 994437bfa6bd83fd50ac96d0583aa81df23ae526 Mon Sep 17 00:00:00 2001 From: Belevskij Sergeij Date: Tue, 27 Dec 2016 14:31:01 +0500 Subject: [PATCH 14/14] Update ru.yml --- config/locales/ru.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/ru.yml b/config/locales/ru.yml index ded01a2e..d896b009 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -17,6 +17,6 @@ ru: assembly_cannot_be_part: сборка не может быть частью product_bundles: Продукт cвязки parts_included: 'Детали, входящие' - part_of_bundle: 'Часть пучка %{sku}' + part_of_bundle: 'Часть набора %{sku}' selected_quantity_not_available: user_selectable: Выбирается пользователем