solidus_product_assembly 1.2.0 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +41 -15
  3. data/CHANGELOG.md +1 -114
  4. data/Gemfile +17 -12
  5. data/OLD_CHANGELOG.md +116 -0
  6. data/Rakefile +1 -0
  7. data/app/views/spree/admin/parts/_parts_table.html.erb +1 -1
  8. data/app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb +3 -3
  9. data/bin/sandbox +27 -11
  10. data/lib/generators/solidus_product_assembly/install/install_generator.rb +0 -2
  11. data/lib/solidus_product_assembly/engine.rb +1 -0
  12. data/lib/solidus_product_assembly/version.rb +1 -1
  13. data/lib/solidus_product_assembly.rb +1 -5
  14. data/solidus_product_assembly.gemspec +22 -26
  15. data/spec/features/admin/orders_spec.rb +0 -1
  16. data/spec/features/admin/parts_spec.rb +7 -6
  17. data/spec/features/admin/return_items_spec.rb +18 -9
  18. data/spec/models/spree/inventory_unit_spec.rb +0 -1
  19. data/spec/models/spree/line_item_spec.rb +0 -1
  20. data/spec/models/spree/order_inventory_assembly_spec.rb +6 -3
  21. data/spec/spec_helper.rb +0 -2
  22. metadata +15 -61
  23. data/app/assets/javascripts/spree/frontend/solidus_product_assembly.js +0 -1
  24. data/app/assets/stylesheets/spree/frontend/solidus_product_assembly.css +0 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a19e2fc4629cafb8d296f9a5b8258500387ccd988b1eccd87b1ca8c49ce5ee97
4
- data.tar.gz: 182ab4d194c7b42ce3a9303ae295172bddc7df08a4fd9d58f97f3f481b2d0247
3
+ metadata.gz: 274a4532455c23274d411612b99ff6aa22619f3d764153711fbb769c8a60c39c
4
+ data.tar.gz: c1319377dcd923f5d327e669cdb8586bce1da7d308cd2ae4471709a7cdd49311
5
5
  SHA512:
6
- metadata.gz: 35265dd9d72240d7bcab27f17856a1683e89d4ef31fe533fe048d3e80827f632bd5bac54fd6268b7d6f7c7a0075e9092758a9a2d3d2b13deeb4f969412b34a53
7
- data.tar.gz: c3fd31fbb302b4335149014f953e0904aa81c119780bd4bfbb3e696cc9e9a8739b0818d409ac20b85abfef6efcdc9185839d6a9e696c573427ad71a1263b9316
6
+ metadata.gz: 6a923b251c002850f85141265e33abc02e183760e0e1a12af562ae7eb88411c3d79d68ec402ee5d7fe657807d70ff6686504345b030a1ddf84bb33b17c4720a7
7
+ data.tar.gz: 53d65715db1f179ffd4a1995731ec4f260a520875427ca574ea52d59512ff53f1daa5f8f908fd5d7712f5a231280af308cb2949ce5dd450f4abbe91d56dd3651
data/.circleci/config.yml CHANGED
@@ -11,27 +11,47 @@ orbs:
11
11
  solidusio_extensions: solidusio/extensions@volatile
12
12
 
13
13
  jobs:
14
- run-specs-with-postgres:
15
- executor: solidusio_extensions/postgres
14
+ run-specs:
15
+ parameters:
16
+ solidus:
17
+ type: string
18
+ default: main
19
+ db:
20
+ type: string
21
+ default: "postgres"
22
+ ruby:
23
+ type: string
24
+ default: "3.2"
25
+ executor:
26
+ name: solidusio_extensions/<< parameters.db >>
27
+ ruby_version: << parameters.ruby >>
16
28
  steps:
17
- - browser-tools/install-browser-tools
18
- - solidusio_extensions/run-tests
19
- run-specs-with-mysql:
20
- executor: solidusio_extensions/mysql
21
- steps:
22
- - browser-tools/install-browser-tools
23
- - solidusio_extensions/run-tests
29
+ - checkout
30
+ - browser-tools/install-chrome
31
+ - solidusio_extensions/run-tests-solidus-<< parameters.solidus >>
32
+
24
33
  lint-code:
25
- executor: solidusio_extensions/sqlite-memory
34
+ executor:
35
+ name: solidusio_extensions/sqlite
36
+ ruby_version: "3.0"
26
37
  steps:
27
- - browser-tools/install-browser-tools
28
38
  - solidusio_extensions/lint-code
29
39
 
30
40
  workflows:
31
41
  "Run specs on supported Solidus versions":
32
42
  jobs:
33
- - run-specs-with-postgres
34
- - run-specs-with-mysql
43
+ - run-specs:
44
+ name: &name "run-specs-solidus-<< matrix.solidus >>-ruby-<< matrix.ruby >>-db-<< matrix.db >>"
45
+ matrix:
46
+ parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
47
+ - run-specs:
48
+ name: *name
49
+ matrix:
50
+ parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
51
+ - run-specs:
52
+ name: *name
53
+ matrix:
54
+ parameters: { solidus: ["older"], ruby: ["3.0"], db: ["sqlite"] }
35
55
  - lint-code
36
56
 
37
57
  "Weekly run specs against master":
@@ -43,5 +63,11 @@ workflows:
43
63
  only:
44
64
  - master
45
65
  jobs:
46
- - run-specs-with-postgres
47
- - run-specs-with-mysql
66
+ - run-specs:
67
+ name: *name
68
+ matrix:
69
+ parameters: { solidus: ["main"], ruby: ["3.2"], db: ["postgres"] }
70
+ - run-specs:
71
+ name: *name
72
+ matrix:
73
+ parameters: { solidus: ["current"], ruby: ["3.1"], db: ["mysql"] }
data/CHANGELOG.md CHANGED
@@ -1,116 +1,3 @@
1
1
  # Changelog
2
2
 
3
- ## [v1.2.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.2.0) (2022-11-02)
4
-
5
- [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.1.0...v1.2.0)
6
-
7
- **Merged pull requests:**
8
-
9
- - Fix before payment override [\#112](https://github.com/solidusio-contrib/solidus_product_assembly/pull/112) ([cpfergus1](https://github.com/cpfergus1))
10
- - Update to use forked solidus\_frontend when needed [\#111](https://github.com/solidusio-contrib/solidus_product_assembly/pull/111) ([waiting-for-dev](https://github.com/waiting-for-dev))
11
- - Search part globalize [\#109](https://github.com/solidusio-contrib/solidus_product_assembly/pull/109) ([AlistairNorman](https://github.com/AlistairNorman))
12
-
13
- ## [v1.1.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.1.0) (2021-10-19)
14
-
15
- [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.0.0...v1.1.0)
16
-
17
- **Closed issues:**
18
-
19
- - Dependabot couldn't find a Gemfile-local for this project [\#107](https://github.com/solidusio-contrib/solidus_product_assembly/issues/107)
20
- - Prepare Solidus Product Assembly for Solidus 3.0 [\#102](https://github.com/solidusio-contrib/solidus_product_assembly/issues/102)
21
- - Error on running specs locally [\#91](https://github.com/solidusio-contrib/solidus_product_assembly/issues/91)
22
- - Dependabot can't resolve your Ruby dependency files [\#80](https://github.com/solidusio-contrib/solidus_product_assembly/issues/80)
23
- - Dependabot can't resolve your Ruby dependency files [\#79](https://github.com/solidusio-contrib/solidus_product_assembly/issues/79)
24
- - Dependabot can't resolve your Ruby dependency files [\#78](https://github.com/solidusio-contrib/solidus_product_assembly/issues/78)
25
- - Dependabot can't resolve your Ruby dependency files [\#77](https://github.com/solidusio-contrib/solidus_product_assembly/issues/77)
26
- - Dependabot can't resolve your Ruby dependency files [\#76](https://github.com/solidusio-contrib/solidus_product_assembly/issues/76)
27
- - Dependabot can't resolve your Ruby dependency files [\#75](https://github.com/solidusio-contrib/solidus_product_assembly/issues/75)
28
- - Dependabot can't resolve your Ruby dependency files [\#74](https://github.com/solidusio-contrib/solidus_product_assembly/issues/74)
29
- - Dependabot can't resolve your Ruby dependency files [\#73](https://github.com/solidusio-contrib/solidus_product_assembly/issues/73)
30
- - Action links for assembly don't work [\#62](https://github.com/solidusio-contrib/solidus_product_assembly/issues/62)
31
- - Wrong return item amounts when returning orders with line items with quantity \> 1 [\#46](https://github.com/solidusio-contrib/solidus_product_assembly/issues/46)
32
- - `method_missing': undefined method `add\_routes' [\#39](https://github.com/solidusio-contrib/solidus_product_assembly/issues/39)
33
- - Deface is required [\#37](https://github.com/solidusio-contrib/solidus_product_assembly/issues/37)
34
- - Javascript not registering Events [\#23](https://github.com/solidusio-contrib/solidus_product_assembly/issues/23)
35
- - Cannot select parts [\#18](https://github.com/solidusio-contrib/solidus_product_assembly/issues/18)
36
-
37
- **Merged pull requests:**
38
-
39
- - Solidus 3 preparation [\#106](https://github.com/solidusio-contrib/solidus_product_assembly/pull/106) ([cpfergus1](https://github.com/cpfergus1))
40
- - Upgrade to GitHub-native Dependabot [\#104](https://github.com/solidusio-contrib/solidus_product_assembly/pull/104) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
41
- - Bump solidus\_support dependency to \(~\> 0.5\) [\#96](https://github.com/solidusio-contrib/solidus_product_assembly/pull/96) ([jcsanti](https://github.com/jcsanti))
42
- - Display parts' available\_on in the admin's "parts" tab \(feature proposal\) [\#95](https://github.com/solidusio-contrib/solidus_product_assembly/pull/95) ([jcsanti](https://github.com/jcsanti))
43
- - Fix Community Guidelines link in Readme [\#94](https://github.com/solidusio-contrib/solidus_product_assembly/pull/94) ([jcsanti](https://github.com/jcsanti))
44
- - Fix failing test in shipment\_spec due to missing store [\#93](https://github.com/solidusio-contrib/solidus_product_assembly/pull/93) ([jcsanti](https://github.com/jcsanti))
45
- - Fix deprecation warning about SolidusSupport.solidus\_gem\_version [\#84](https://github.com/solidusio-contrib/solidus_product_assembly/pull/84) ([stem](https://github.com/stem))
46
- - Upgrade the extension using solidus\_dev\_support [\#81](https://github.com/solidusio-contrib/solidus_product_assembly/pull/81) ([blocknotes](https://github.com/blocknotes))
47
- - Adopt solidus\_extension\_dev\_tools [\#71](https://github.com/solidusio-contrib/solidus_product_assembly/pull/71) ([aldesantis](https://github.com/aldesantis))
48
- - Remove deprecation for Reimbursement\#simulate [\#69](https://github.com/solidusio-contrib/solidus_product_assembly/pull/69) ([spaghetticode](https://github.com/spaghetticode))
49
- - Remove broken buttons in Shipments page [\#68](https://github.com/solidusio-contrib/solidus_product_assembly/pull/68) ([spaghetticode](https://github.com/spaghetticode))
50
- - Update factory\_bot requirement from 5.1.0 to 5.1.1 [\#67](https://github.com/solidusio-contrib/solidus_product_assembly/pull/67) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
51
- - Update puma requirement from ~\> 3.12 to ~\> 4.2 [\#66](https://github.com/solidusio-contrib/solidus_product_assembly/pull/66) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
52
- - Update factory\_bot requirement from 4.10.0 to 5.1.0 [\#65](https://github.com/solidusio-contrib/solidus_product_assembly/pull/65) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
53
- - Update pg requirement from ~\> 0.21 to ~\> 1.1 [\#64](https://github.com/solidusio-contrib/solidus_product_assembly/pull/64) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
54
- - Update sqlite3 requirement from ~\> 1.3.6 to ~\> 1.4.1 [\#63](https://github.com/solidusio-contrib/solidus_product_assembly/pull/63) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
55
- - Use `ActionView::Helpers::TranslationHelper.t` [\#60](https://github.com/solidusio-contrib/solidus_product_assembly/pull/60) ([spaghetticode](https://github.com/spaghetticode))
56
- - Releasing new gem version to RubyGems, changelog generation [\#57](https://github.com/solidusio-contrib/solidus_product_assembly/pull/57) ([spaghetticode](https://github.com/spaghetticode))
57
- - Remove Travis CI [\#56](https://github.com/solidusio-contrib/solidus_product_assembly/pull/56) ([spaghetticode](https://github.com/spaghetticode))
58
- - Add SKU to \_stock\_item [\#55](https://github.com/solidusio-contrib/solidus_product_assembly/pull/55) ([ericsaupe](https://github.com/ericsaupe))
59
- - Add CircleCI build [\#54](https://github.com/solidusio-contrib/solidus_product_assembly/pull/54) ([spaghetticode](https://github.com/spaghetticode))
60
- - Load Capybara config from `solidus_support` gem [\#53](https://github.com/solidusio-contrib/solidus_product_assembly/pull/53) ([spaghetticode](https://github.com/spaghetticode))
61
- - Fix build on Travis [\#52](https://github.com/solidusio-contrib/solidus_product_assembly/pull/52) ([spaghetticode](https://github.com/spaghetticode))
62
- - Update `#determine_target_shipment` after Solidus \#3197 [\#50](https://github.com/solidusio-contrib/solidus_product_assembly/pull/50) ([spaghetticode](https://github.com/spaghetticode))
63
- - Show split/delete actions for all items \(admin/orders/shipment\) [\#49](https://github.com/solidusio-contrib/solidus_product_assembly/pull/49) ([MinasMazar](https://github.com/MinasMazar))
64
- - Show correct RMA amounts when assembly has more than one piece for var… [\#48](https://github.com/solidusio-contrib/solidus_product_assembly/pull/48) ([spaghetticode](https://github.com/spaghetticode))
65
- - Fix build on Travis [\#47](https://github.com/solidusio-contrib/solidus_product_assembly/pull/47) ([spaghetticode](https://github.com/spaghetticode))
66
- - Fix return item amounts with multiple items [\#45](https://github.com/solidusio-contrib/solidus_product_assembly/pull/45) ([spaghetticode](https://github.com/spaghetticode))
67
- - add deface as a development dependency in gemspec [\#44](https://github.com/solidusio-contrib/solidus_product_assembly/pull/44) ([kevinjbayer](https://github.com/kevinjbayer))
68
- - Round up default refund amount for assembly parts [\#43](https://github.com/solidusio-contrib/solidus_product_assembly/pull/43) ([spaghetticode](https://github.com/spaghetticode))
69
- - Remove assembly part prices from carton manifest [\#42](https://github.com/solidusio-contrib/solidus_product_assembly/pull/42) ([spaghetticode](https://github.com/spaghetticode))
70
- - Split refund amount proportionally on each assembly part [\#41](https://github.com/solidusio-contrib/solidus_product_assembly/pull/41) ([spaghetticode](https://github.com/spaghetticode))
71
- - Fix stock finalization with non-backorderable stock and Solidus \>= 2.8 [\#40](https://github.com/solidusio-contrib/solidus_product_assembly/pull/40) ([spaghetticode](https://github.com/spaghetticode))
72
- - Replace `Spree.t` with `I18n.t` [\#38](https://github.com/solidusio-contrib/solidus_product_assembly/pull/38) ([spaghetticode](https://github.com/spaghetticode))
73
- - Lock SQLite3 to version 1.3 [\#36](https://github.com/solidusio-contrib/solidus_product_assembly/pull/36) ([aitbw](https://github.com/aitbw))
74
- - Add Solidus v2.8 to Travis config [\#35](https://github.com/solidusio-contrib/solidus_product_assembly/pull/35) ([aitbw](https://github.com/aitbw))
75
- - Remove stale edit button [\#34](https://github.com/solidusio-contrib/solidus_product_assembly/pull/34) ([spaghetticode](https://github.com/spaghetticode))
76
- - Use Selenium with Chrome headless instead of Poltergeist [\#33](https://github.com/solidusio-contrib/solidus_product_assembly/pull/33) ([spaghetticode](https://github.com/spaghetticode))
77
- - Fix `stock_item` partial for splitting items [\#32](https://github.com/solidusio-contrib/solidus_product_assembly/pull/32) ([spaghetticode](https://github.com/spaghetticode))
78
- - Fix admin edit for shipping costs and tracking [\#31](https://github.com/solidusio-contrib/solidus_product_assembly/pull/31) ([spaghetticode](https://github.com/spaghetticode))
79
- - AvailabilityValidator delegates to Solidus implementation when product is not an assembly [\#30](https://github.com/solidusio-contrib/solidus_product_assembly/pull/30) ([spaghetticode](https://github.com/spaghetticode))
80
- - Test suite maintenance [\#29](https://github.com/solidusio-contrib/solidus_product_assembly/pull/29) ([aitbw](https://github.com/aitbw))
81
- - Remove 2.2 from CI \(EOL\) [\#28](https://github.com/solidusio-contrib/solidus_product_assembly/pull/28) ([jacobherrington](https://github.com/jacobherrington))
82
- - Remove versions past EOL from .travis.yml [\#27](https://github.com/solidusio-contrib/solidus_product_assembly/pull/27) ([jacobherrington](https://github.com/jacobherrington))
83
- - Add Solidus 2.7 to .travis.yml [\#26](https://github.com/solidusio-contrib/solidus_product_assembly/pull/26) ([jacobherrington](https://github.com/jacobherrington))
84
- - Update for Solidus 2.5 [\#21](https://github.com/solidusio-contrib/solidus_product_assembly/pull/21) ([jhawthorn](https://github.com/jhawthorn))
85
- - Fix warnings [\#20](https://github.com/solidusio-contrib/solidus_product_assembly/pull/20) ([jhawthorn](https://github.com/jhawthorn))
86
- - 2.4 fixes [\#19](https://github.com/solidusio-contrib/solidus_product_assembly/pull/19) ([jhawthorn](https://github.com/jhawthorn))
87
- - Avoid stubbing in spec [\#17](https://github.com/solidusio-contrib/solidus_product_assembly/pull/17) ([jhawthorn](https://github.com/jhawthorn))
88
- - Remove old Spree information from README [\#16](https://github.com/solidusio-contrib/solidus_product_assembly/pull/16) ([brchristian](https://github.com/brchristian))
89
- - Removing small\_image Method Call. Replacing It To Avoid Error. [\#15](https://github.com/solidusio-contrib/solidus_product_assembly/pull/15) ([hugohernani](https://github.com/hugohernani))
90
- - Fix deprecations and removals [\#14](https://github.com/solidusio-contrib/solidus_product_assembly/pull/14) ([jhawthorn](https://github.com/jhawthorn))
91
- - Remove add\_routes fo routes.draw [\#13](https://github.com/solidusio-contrib/solidus_product_assembly/pull/13) ([denissellu](https://github.com/denissellu))
92
- - Fix migration to allow rollback [\#12](https://github.com/solidusio-contrib/solidus_product_assembly/pull/12) ([tudorpavel](https://github.com/tudorpavel))
93
- - Parts informations in API [\#11](https://github.com/solidusio-contrib/solidus_product_assembly/pull/11) ([DanielePalombo](https://github.com/DanielePalombo))
94
-
95
- ## [v1.0.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.0.0) (2016-09-06)
96
-
97
- [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/7a6d85258735c0035d675364fc9000cdd7355e0e...v1.0.0)
98
-
99
- **Closed issues:**
100
-
101
- - Inventory Validation fail upon checkout, for the assembly product [\#3](https://github.com/solidusio-contrib/solidus_product_assembly/issues/3)
102
-
103
- **Merged pull requests:**
104
-
105
- - Add support for Solidus 2.0 and Rails 5 [\#10](https://github.com/solidusio-contrib/solidus_product_assembly/pull/10) ([jhawthorn](https://github.com/jhawthorn))
106
- - Fix installation instructions in README [\#9](https://github.com/solidusio-contrib/solidus_product_assembly/pull/9) ([alexblackie](https://github.com/alexblackie))
107
- - Add missing translation for actions.delete [\#8](https://github.com/solidusio-contrib/solidus_product_assembly/pull/8) ([Sinetheta](https://github.com/Sinetheta))
108
- - Fix a load order issue when redefining inventory validator. [\#7](https://github.com/solidusio-contrib/solidus_product_assembly/pull/7) ([Senjai](https://github.com/Senjai))
109
- - Fix product sub\_menu display on new Solidus [\#6](https://github.com/solidusio-contrib/solidus_product_assembly/pull/6) ([Sinetheta](https://github.com/Sinetheta))
110
- - Inventory validation [\#5](https://github.com/solidusio-contrib/solidus_product_assembly/pull/5) ([Sinetheta](https://github.com/Sinetheta))
111
- - Rename to solidus\_product\_assembly [\#2](https://github.com/solidusio-contrib/solidus_product_assembly/pull/2) ([Sinetheta](https://github.com/Sinetheta))
112
- - Upgrade from spree 2.4 to solidus 1.1-1.3 [\#1](https://github.com/solidusio-contrib/solidus_product_assembly/pull/1) ([Sinetheta](https://github.com/Sinetheta))
113
-
114
-
115
-
116
- \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
3
+ See https://github.com/solidusio-contrib/solidus_product_assembly/releases or [OLD_CHANGELOG.md](OLD_CHANGELOG.md) for older versions.
data/Gemfile CHANGED
@@ -3,14 +3,17 @@
3
3
  source 'https://rubygems.org'
4
4
  git_source(:github) { |repo| "https://github.com/#{repo}.git" }
5
5
 
6
- branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
7
- solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
8
- %w[solidusio/solidus solidusio/solidus_frontend]
9
- else
10
- %w[solidusio/solidus] * 2
11
- end
12
- gem 'solidus', github: solidus_git, branch: branch
13
- gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
6
+ branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
7
+ gem 'solidus', github: 'solidusio/solidus', branch: branch
8
+
9
+ # The solidus_frontend gem has been pulled out since v3.2
10
+ if branch >= 'v3.2'
11
+ gem 'solidus_frontend'
12
+ elsif branch == 'main'
13
+ gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
14
+ else
15
+ gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
16
+ end
14
17
 
15
18
  # Needed to help Bundler figure out how to resolve dependencies,
16
19
  # otherwise it takes forever to resolve them.
@@ -19,6 +22,8 @@ gem 'rails', '>0.a'
19
22
 
20
23
  # Provides basic authentication functionality for testing parts of your engine
21
24
  gem 'solidus_auth_devise'
25
+
26
+ gem 'friendly_id-globalize', github: 'norman/friendly_id-globalize', branch: "master"
22
27
  gem 'solidus_globalize', github: 'solidusio-contrib/solidus_globalize'
23
28
 
24
29
  case ENV.fetch('DB', nil)
@@ -30,10 +35,10 @@ else
30
35
  gem 'sqlite3'
31
36
  end
32
37
 
33
- group :test do
34
- gem 'webdrivers'
35
- gem 'selenium-webdriver'
36
- end
38
+ # While we still support Ruby < 3 we need to workaround a limitation in
39
+ # the 'async' gem that relies on the latest ruby, since RubyGems doesn't
40
+ # resolve gems based on the required ruby version.
41
+ gem 'async', '< 3' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3')
37
42
 
38
43
  gemspec
39
44
 
data/OLD_CHANGELOG.md ADDED
@@ -0,0 +1,116 @@
1
+ # Changelog
2
+
3
+ ## [v1.2.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.2.0) (2022-11-02)
4
+
5
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.1.0...v1.2.0)
6
+
7
+ **Merged pull requests:**
8
+
9
+ - Fix before payment override [\#112](https://github.com/solidusio-contrib/solidus_product_assembly/pull/112) ([cpfergus1](https://github.com/cpfergus1))
10
+ - Update to use forked solidus\_frontend when needed [\#111](https://github.com/solidusio-contrib/solidus_product_assembly/pull/111) ([waiting-for-dev](https://github.com/waiting-for-dev))
11
+ - Search part globalize [\#109](https://github.com/solidusio-contrib/solidus_product_assembly/pull/109) ([AlistairNorman](https://github.com/AlistairNorman))
12
+
13
+ ## [v1.1.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.1.0) (2021-10-19)
14
+
15
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/v1.0.0...v1.1.0)
16
+
17
+ **Closed issues:**
18
+
19
+ - Dependabot couldn't find a Gemfile-local for this project [\#107](https://github.com/solidusio-contrib/solidus_product_assembly/issues/107)
20
+ - Prepare Solidus Product Assembly for Solidus 3.0 [\#102](https://github.com/solidusio-contrib/solidus_product_assembly/issues/102)
21
+ - Error on running specs locally [\#91](https://github.com/solidusio-contrib/solidus_product_assembly/issues/91)
22
+ - Dependabot can't resolve your Ruby dependency files [\#80](https://github.com/solidusio-contrib/solidus_product_assembly/issues/80)
23
+ - Dependabot can't resolve your Ruby dependency files [\#79](https://github.com/solidusio-contrib/solidus_product_assembly/issues/79)
24
+ - Dependabot can't resolve your Ruby dependency files [\#78](https://github.com/solidusio-contrib/solidus_product_assembly/issues/78)
25
+ - Dependabot can't resolve your Ruby dependency files [\#77](https://github.com/solidusio-contrib/solidus_product_assembly/issues/77)
26
+ - Dependabot can't resolve your Ruby dependency files [\#76](https://github.com/solidusio-contrib/solidus_product_assembly/issues/76)
27
+ - Dependabot can't resolve your Ruby dependency files [\#75](https://github.com/solidusio-contrib/solidus_product_assembly/issues/75)
28
+ - Dependabot can't resolve your Ruby dependency files [\#74](https://github.com/solidusio-contrib/solidus_product_assembly/issues/74)
29
+ - Dependabot can't resolve your Ruby dependency files [\#73](https://github.com/solidusio-contrib/solidus_product_assembly/issues/73)
30
+ - Action links for assembly don't work [\#62](https://github.com/solidusio-contrib/solidus_product_assembly/issues/62)
31
+ - Wrong return item amounts when returning orders with line items with quantity \> 1 [\#46](https://github.com/solidusio-contrib/solidus_product_assembly/issues/46)
32
+ - `method_missing': undefined method `add\_routes' [\#39](https://github.com/solidusio-contrib/solidus_product_assembly/issues/39)
33
+ - Deface is required [\#37](https://github.com/solidusio-contrib/solidus_product_assembly/issues/37)
34
+ - Javascript not registering Events [\#23](https://github.com/solidusio-contrib/solidus_product_assembly/issues/23)
35
+ - Cannot select parts [\#18](https://github.com/solidusio-contrib/solidus_product_assembly/issues/18)
36
+
37
+ **Merged pull requests:**
38
+
39
+ - Solidus 3 preparation [\#106](https://github.com/solidusio-contrib/solidus_product_assembly/pull/106) ([cpfergus1](https://github.com/cpfergus1))
40
+ - Upgrade to GitHub-native Dependabot [\#104](https://github.com/solidusio-contrib/solidus_product_assembly/pull/104) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
41
+ - Bump solidus\_support dependency to \(~\> 0.5\) [\#96](https://github.com/solidusio-contrib/solidus_product_assembly/pull/96) ([jcsanti](https://github.com/jcsanti))
42
+ - Display parts' available\_on in the admin's "parts" tab \(feature proposal\) [\#95](https://github.com/solidusio-contrib/solidus_product_assembly/pull/95) ([jcsanti](https://github.com/jcsanti))
43
+ - Fix Community Guidelines link in Readme [\#94](https://github.com/solidusio-contrib/solidus_product_assembly/pull/94) ([jcsanti](https://github.com/jcsanti))
44
+ - Fix failing test in shipment\_spec due to missing store [\#93](https://github.com/solidusio-contrib/solidus_product_assembly/pull/93) ([jcsanti](https://github.com/jcsanti))
45
+ - Fix deprecation warning about SolidusSupport.solidus\_gem\_version [\#84](https://github.com/solidusio-contrib/solidus_product_assembly/pull/84) ([stem](https://github.com/stem))
46
+ - Upgrade the extension using solidus\_dev\_support [\#81](https://github.com/solidusio-contrib/solidus_product_assembly/pull/81) ([blocknotes](https://github.com/blocknotes))
47
+ - Adopt solidus\_extension\_dev\_tools [\#71](https://github.com/solidusio-contrib/solidus_product_assembly/pull/71) ([aldesantis](https://github.com/aldesantis))
48
+ - Remove deprecation for Reimbursement\#simulate [\#69](https://github.com/solidusio-contrib/solidus_product_assembly/pull/69) ([spaghetticode](https://github.com/spaghetticode))
49
+ - Remove broken buttons in Shipments page [\#68](https://github.com/solidusio-contrib/solidus_product_assembly/pull/68) ([spaghetticode](https://github.com/spaghetticode))
50
+ - Update factory\_bot requirement from 5.1.0 to 5.1.1 [\#67](https://github.com/solidusio-contrib/solidus_product_assembly/pull/67) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
51
+ - Update puma requirement from ~\> 3.12 to ~\> 4.2 [\#66](https://github.com/solidusio-contrib/solidus_product_assembly/pull/66) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
52
+ - Update factory\_bot requirement from 4.10.0 to 5.1.0 [\#65](https://github.com/solidusio-contrib/solidus_product_assembly/pull/65) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
53
+ - Update pg requirement from ~\> 0.21 to ~\> 1.1 [\#64](https://github.com/solidusio-contrib/solidus_product_assembly/pull/64) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
54
+ - Update sqlite3 requirement from ~\> 1.3.6 to ~\> 1.4.1 [\#63](https://github.com/solidusio-contrib/solidus_product_assembly/pull/63) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
55
+ - Use `ActionView::Helpers::TranslationHelper.t` [\#60](https://github.com/solidusio-contrib/solidus_product_assembly/pull/60) ([spaghetticode](https://github.com/spaghetticode))
56
+ - Releasing new gem version to RubyGems, changelog generation [\#57](https://github.com/solidusio-contrib/solidus_product_assembly/pull/57) ([spaghetticode](https://github.com/spaghetticode))
57
+ - Remove Travis CI [\#56](https://github.com/solidusio-contrib/solidus_product_assembly/pull/56) ([spaghetticode](https://github.com/spaghetticode))
58
+ - Add SKU to \_stock\_item [\#55](https://github.com/solidusio-contrib/solidus_product_assembly/pull/55) ([ericsaupe](https://github.com/ericsaupe))
59
+ - Add CircleCI build [\#54](https://github.com/solidusio-contrib/solidus_product_assembly/pull/54) ([spaghetticode](https://github.com/spaghetticode))
60
+ - Load Capybara config from `solidus_support` gem [\#53](https://github.com/solidusio-contrib/solidus_product_assembly/pull/53) ([spaghetticode](https://github.com/spaghetticode))
61
+ - Fix build on Travis [\#52](https://github.com/solidusio-contrib/solidus_product_assembly/pull/52) ([spaghetticode](https://github.com/spaghetticode))
62
+ - Update `#determine_target_shipment` after Solidus \#3197 [\#50](https://github.com/solidusio-contrib/solidus_product_assembly/pull/50) ([spaghetticode](https://github.com/spaghetticode))
63
+ - Show split/delete actions for all items \(admin/orders/shipment\) [\#49](https://github.com/solidusio-contrib/solidus_product_assembly/pull/49) ([MinasMazar](https://github.com/MinasMazar))
64
+ - Show correct RMA amounts when assembly has more than one piece for var… [\#48](https://github.com/solidusio-contrib/solidus_product_assembly/pull/48) ([spaghetticode](https://github.com/spaghetticode))
65
+ - Fix build on Travis [\#47](https://github.com/solidusio-contrib/solidus_product_assembly/pull/47) ([spaghetticode](https://github.com/spaghetticode))
66
+ - Fix return item amounts with multiple items [\#45](https://github.com/solidusio-contrib/solidus_product_assembly/pull/45) ([spaghetticode](https://github.com/spaghetticode))
67
+ - add deface as a development dependency in gemspec [\#44](https://github.com/solidusio-contrib/solidus_product_assembly/pull/44) ([kevinjbayer](https://github.com/kevinjbayer))
68
+ - Round up default refund amount for assembly parts [\#43](https://github.com/solidusio-contrib/solidus_product_assembly/pull/43) ([spaghetticode](https://github.com/spaghetticode))
69
+ - Remove assembly part prices from carton manifest [\#42](https://github.com/solidusio-contrib/solidus_product_assembly/pull/42) ([spaghetticode](https://github.com/spaghetticode))
70
+ - Split refund amount proportionally on each assembly part [\#41](https://github.com/solidusio-contrib/solidus_product_assembly/pull/41) ([spaghetticode](https://github.com/spaghetticode))
71
+ - Fix stock finalization with non-backorderable stock and Solidus \>= 2.8 [\#40](https://github.com/solidusio-contrib/solidus_product_assembly/pull/40) ([spaghetticode](https://github.com/spaghetticode))
72
+ - Replace `Spree.t` with `I18n.t` [\#38](https://github.com/solidusio-contrib/solidus_product_assembly/pull/38) ([spaghetticode](https://github.com/spaghetticode))
73
+ - Lock SQLite3 to version 1.3 [\#36](https://github.com/solidusio-contrib/solidus_product_assembly/pull/36) ([aitbw](https://github.com/aitbw))
74
+ - Add Solidus v2.8 to Travis config [\#35](https://github.com/solidusio-contrib/solidus_product_assembly/pull/35) ([aitbw](https://github.com/aitbw))
75
+ - Remove stale edit button [\#34](https://github.com/solidusio-contrib/solidus_product_assembly/pull/34) ([spaghetticode](https://github.com/spaghetticode))
76
+ - Use Selenium with Chrome headless instead of Poltergeist [\#33](https://github.com/solidusio-contrib/solidus_product_assembly/pull/33) ([spaghetticode](https://github.com/spaghetticode))
77
+ - Fix `stock_item` partial for splitting items [\#32](https://github.com/solidusio-contrib/solidus_product_assembly/pull/32) ([spaghetticode](https://github.com/spaghetticode))
78
+ - Fix admin edit for shipping costs and tracking [\#31](https://github.com/solidusio-contrib/solidus_product_assembly/pull/31) ([spaghetticode](https://github.com/spaghetticode))
79
+ - AvailabilityValidator delegates to Solidus implementation when product is not an assembly [\#30](https://github.com/solidusio-contrib/solidus_product_assembly/pull/30) ([spaghetticode](https://github.com/spaghetticode))
80
+ - Test suite maintenance [\#29](https://github.com/solidusio-contrib/solidus_product_assembly/pull/29) ([aitbw](https://github.com/aitbw))
81
+ - Remove 2.2 from CI \(EOL\) [\#28](https://github.com/solidusio-contrib/solidus_product_assembly/pull/28) ([jacobherrington](https://github.com/jacobherrington))
82
+ - Remove versions past EOL from .travis.yml [\#27](https://github.com/solidusio-contrib/solidus_product_assembly/pull/27) ([jacobherrington](https://github.com/jacobherrington))
83
+ - Add Solidus 2.7 to .travis.yml [\#26](https://github.com/solidusio-contrib/solidus_product_assembly/pull/26) ([jacobherrington](https://github.com/jacobherrington))
84
+ - Update for Solidus 2.5 [\#21](https://github.com/solidusio-contrib/solidus_product_assembly/pull/21) ([jhawthorn](https://github.com/jhawthorn))
85
+ - Fix warnings [\#20](https://github.com/solidusio-contrib/solidus_product_assembly/pull/20) ([jhawthorn](https://github.com/jhawthorn))
86
+ - 2.4 fixes [\#19](https://github.com/solidusio-contrib/solidus_product_assembly/pull/19) ([jhawthorn](https://github.com/jhawthorn))
87
+ - Avoid stubbing in spec [\#17](https://github.com/solidusio-contrib/solidus_product_assembly/pull/17) ([jhawthorn](https://github.com/jhawthorn))
88
+ - Remove old Spree information from README [\#16](https://github.com/solidusio-contrib/solidus_product_assembly/pull/16) ([brchristian](https://github.com/brchristian))
89
+ - Removing small\_image Method Call. Replacing It To Avoid Error. [\#15](https://github.com/solidusio-contrib/solidus_product_assembly/pull/15) ([hugohernani](https://github.com/hugohernani))
90
+ - Fix deprecations and removals [\#14](https://github.com/solidusio-contrib/solidus_product_assembly/pull/14) ([jhawthorn](https://github.com/jhawthorn))
91
+ - Remove add\_routes fo routes.draw [\#13](https://github.com/solidusio-contrib/solidus_product_assembly/pull/13) ([denissellu](https://github.com/denissellu))
92
+ - Fix migration to allow rollback [\#12](https://github.com/solidusio-contrib/solidus_product_assembly/pull/12) ([tudorpavel](https://github.com/tudorpavel))
93
+ - Parts informations in API [\#11](https://github.com/solidusio-contrib/solidus_product_assembly/pull/11) ([DanielePalombo](https://github.com/DanielePalombo))
94
+
95
+ ## [v1.0.0](https://github.com/solidusio-contrib/solidus_product_assembly/tree/v1.0.0) (2016-09-06)
96
+
97
+ [Full Changelog](https://github.com/solidusio-contrib/solidus_product_assembly/compare/7a6d85258735c0035d675364fc9000cdd7355e0e...v1.0.0)
98
+
99
+ **Closed issues:**
100
+
101
+ - Inventory Validation fail upon checkout, for the assembly product [\#3](https://github.com/solidusio-contrib/solidus_product_assembly/issues/3)
102
+
103
+ **Merged pull requests:**
104
+
105
+ - Add support for Solidus 2.0 and Rails 5 [\#10](https://github.com/solidusio-contrib/solidus_product_assembly/pull/10) ([jhawthorn](https://github.com/jhawthorn))
106
+ - Fix installation instructions in README [\#9](https://github.com/solidusio-contrib/solidus_product_assembly/pull/9) ([alexblackie](https://github.com/alexblackie))
107
+ - Add missing translation for actions.delete [\#8](https://github.com/solidusio-contrib/solidus_product_assembly/pull/8) ([Sinetheta](https://github.com/Sinetheta))
108
+ - Fix a load order issue when redefining inventory validator. [\#7](https://github.com/solidusio-contrib/solidus_product_assembly/pull/7) ([Senjai](https://github.com/Senjai))
109
+ - Fix product sub\_menu display on new Solidus [\#6](https://github.com/solidusio-contrib/solidus_product_assembly/pull/6) ([Sinetheta](https://github.com/Sinetheta))
110
+ - Inventory validation [\#5](https://github.com/solidusio-contrib/solidus_product_assembly/pull/5) ([Sinetheta](https://github.com/Sinetheta))
111
+ - Rename to solidus\_product\_assembly [\#2](https://github.com/solidusio-contrib/solidus_product_assembly/pull/2) ([Sinetheta](https://github.com/Sinetheta))
112
+ - Upgrade from spree 2.4 to solidus 1.1-1.3 [\#1](https://github.com/solidusio-contrib/solidus_product_assembly/pull/1) ([Sinetheta](https://github.com/Sinetheta))
113
+
114
+
115
+
116
+ \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
data/Rakefile CHANGED
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'bundler/gem_tasks'
3
4
  require 'solidus_dev_support/rake_tasks'
4
5
  SolidusDevSupport::RakeTasks.install
5
6
 
data/app/views/spree/admin/parts/_parts_table.html.erb CHANGED
@@ -24,7 +24,7 @@
24
24
  :class => "set_count_admin_product_part_link save-line-item") %>
25
25
 
26
26
  <%= link_to_with_icon(
27
- 'delete',
27
+ 'trash',
28
28
  t('spree.actions.delete'),
29
29
  remove_admin_product_part_url(@product, part),
30
30
  class: "remove_admin_product_part_link delete-line-item") %>
data/app/views/spree/admin/shared/_product_assembly_product_tabs.html.erb CHANGED
@@ -1,3 +1,3 @@
1
- <li<%= ' class="active"' if current == "Parts" %>>
2
- <%= link_to_with_icon 'sitemap', t('spree.parts'), admin_product_parts_url(@product) %>
3
- </li>
1
+ <%= content_tag :li, class: ('active' if current == 'Parts') do %>
2
+ <%= link_to t('spree.parts'), admin_product_parts_url(@product) %>
3
+ <% end if can?(:admin, Spree::AssembliesPart) && !@product.deleted? %>
data/bin/sandbox CHANGED
@@ -1,6 +1,10 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
3
  set -e
4
+ if [ ! -z $DEBUG ]
5
+ then
6
+ set -x
7
+ fi
4
8
 
5
9
  case "$DB" in
6
10
  postgres|postgresql)
@@ -9,21 +13,36 @@ postgres|postgresql)
9
13
  mysql)
10
14
  RAILSDB="mysql"
11
15
  ;;
12
- sqlite|'')
16
+ sqlite3|sqlite)
17
+ RAILSDB="sqlite3"
18
+ ;;
19
+ '')
20
+ echo "~~> Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
13
21
  RAILSDB="sqlite3"
14
22
  ;;
15
23
  *)
16
- echo "Invalid DB specified: $DB"
24
+ echo "Invalid value specified for the Solidus sandbox: DB=\"$DB\"."
25
+ echo "Please use 'postgres', 'mysql', or 'sqlite' instead."
17
26
  exit 1
18
27
  ;;
19
28
  esac
29
+ echo "~~> Using $RAILSDB as the database engine"
20
30
 
21
- if [ ! -z $SOLIDUS_BRANCH ]
31
+ if [ -n $SOLIDUS_BRANCH ]
22
32
  then
23
33
  BRANCH=$SOLIDUS_BRANCH
24
34
  else
35
+ echo "~~> Use 'export SOLIDUS_BRANCH=[master|v3.2|...]' to control the Solidus branch"
25
36
  BRANCH="master"
26
37
  fi
38
+ echo "~~> Using branch $BRANCH of solidus"
39
+
40
+ if [ -z $SOLIDUS_FRONTEND ]
41
+ then
42
+ echo "~~> Use 'export SOLIDUS_FRONTEND=[solidus_frontend|solidus_starter_frontend]' to control the Solidus frontend"
43
+ SOLIDUS_FRONTEND="solidus_frontend"
44
+ fi
45
+ echo "~~> Using branch $SOLIDUS_FRONTEND as the solidus frontend"
27
46
 
28
47
  extension_name="solidus_product_assembly"
29
48
 
@@ -50,7 +69,6 @@ fi
50
69
  cd ./sandbox
51
70
  cat <<RUBY >> Gemfile
52
71
  gem 'solidus', github: 'solidusio/solidus', branch: '$BRANCH'
53
- gem 'solidus_auth_devise', '>= 2.1.0'
54
72
  gem 'rails-i18n'
55
73
  gem 'solidus_i18n'
56
74
 
@@ -71,16 +89,14 @@ unbundled bundle exec rails generate solidus:install \
71
89
  --auto-accept \
72
90
  --user_class=Spree::User \
73
91
  --enforce_available_locales=true \
74
- --with-authentication=false \
92
+ --with-authentication=true \
75
93
  --payment-method=none \
94
+ --frontend=${SOLIDUS_FRONTEND} \
76
95
  $@
77
96
 
78
- unbundled bundle exec rails generate solidus:auth:install
79
- unbundled bundle exec rails generate ${extension_name}:install
97
+ unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations
98
+ unbundled bundle exec rails generate ${extension_name}:install --auto-run-migrations
80
99
 
81
100
  echo
82
101
  echo "🚀 Sandbox app successfully created for $extension_name!"
83
- echo "🚀 Using $RAILSDB and Solidus $BRANCH"
84
- echo "🚀 Use 'export DB=[postgres|mysql|sqlite]' to control the DB adapter"
85
- echo "🚀 Use 'export SOLIDUS_BRANCH=<BRANCH-NAME>' to control the Solidus version"
86
- echo "🚀 This app is intended for test purposes."
102
+ echo "🧪 This app is intended for test purposes."
data/lib/generators/solidus_product_assembly/install/install_generator.rb CHANGED
@@ -11,12 +11,10 @@ module SolidusProductAssembly
11
11
  end
12
12
 
13
13
  def add_javascripts
14
- append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/solidus_product_assembly\n"
15
14
  append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_product_assembly\n"
16
15
  end
17
16
 
18
17
  def add_stylesheets
19
- inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/solidus_product_assembly\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
20
18
  inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_product_assembly\n", before: %r{\*/}, verbose: true # rubocop:disable Layout/LineLength
21
19
  end
22
20
 
data/lib/solidus_product_assembly/engine.rb CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  require 'solidus_core'
4
4
  require 'solidus_support'
5
+ require 'deface'
5
6
 
6
7
  module SolidusProductAssembly
7
8
  class Engine < Rails::Engine
data/lib/solidus_product_assembly/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module SolidusProductAssembly
4
- VERSION = '1.2.0'
4
+ VERSION = '1.3.0'
5
5
  end
data/lib/solidus_product_assembly.rb CHANGED
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'solidus_core'
4
- require 'solidus_support'
5
- require 'deface'
6
-
3
+ require 'solidus_product_assembly/configuration'
7
4
  require 'solidus_product_assembly/version'
8
5
  require 'solidus_product_assembly/engine'
9
- require 'solidus_product_assembly/configuration'
data/solidus_product_assembly.gemspec CHANGED
@@ -2,40 +2,36 @@
2
2
 
3
3
  require_relative 'lib/solidus_product_assembly/version'
4
4
 
5
- Gem::Specification.new do |s|
6
- s.platform = Gem::Platform::RUBY
7
- s.name = 'solidus_product_assembly'
8
- s.version = SolidusProductAssembly::VERSION
9
- s.authors = ['Roman Smirnov']
10
- s.email = 'roman@railsdog.com'
5
+ Gem::Specification.new do |spec|
6
+ spec.name = 'solidus_product_assembly'
7
+ spec.version = SolidusProductAssembly::VERSION
8
+ spec.authors = ['Roman Smirnov']
9
+ spec.email = 'roman@railsdog.com'
11
10
 
12
- s.summary = 'Adds opportunity to make bundle of products to your Spree store'
13
- s.description = s.summary
14
- s.homepage = 'https://solidus.io'
15
- s.license = 'BSD-3-Clause'
11
+ spec.summary = 'Make bundle of products to your Solidus store'
12
+ spec.description = 'Make bundle of products to your Solidus store'
13
+ spec.homepage = 'https://github.com/solidusio-contrib/solidus_product_assembly'
14
+ spec.license = 'BSD-3-Clause'
16
15
 
17
- s.metadata['homepage_uri'] = s.homepage
18
- s.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_product_assembly'
19
- s.metadata['changelog_uri'] = 'https://github.com/SuperGoodSoft/solidus_product_assembly/blob/master/CHANGELOG.md'
16
+ spec.metadata['homepage_uri'] = spec.homepage
17
+ spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_product_assembly'
18
+ spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_product_assembly/releases'
20
19
 
21
- s.required_ruby_version = '>= 2.4'
20
+ spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 4')
22
21
 
23
22
  # Specify which files should be added to the gem when it is released.
24
23
  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
25
24
  files = Dir.chdir(__dir__) { `git ls-files -z`.split("\x0") }
26
25
 
27
- s.files = files.grep_v(%r{^(test|spec|features)/})
28
- s.test_files = files.grep(%r{^(test|spec|features)/})
29
- s.bindir = "exe"
30
- s.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
31
- s.require_paths = ["lib"]
26
+ spec.files = files.grep_v(%r{^(test|spec|features)/})
27
+ spec.test_files = files.grep(%r{^(test|spec|features)/})
28
+ spec.bindir = "exe"
29
+ spec.executables = files.grep(%r{^exe/}) { |f| File.basename(f) }
30
+ spec.require_paths = ["lib"]
32
31
 
33
- s.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
34
- s.add_dependency 'solidus_support', '~> 0.8'
35
- s.add_dependency 'deface'
32
+ spec.add_dependency 'solidus_core', '>= 3.2'
33
+ spec.add_dependency 'solidus_support', '~> 0.8'
34
+ spec.add_dependency 'deface'
36
35
 
37
- s.add_development_dependency 'solidus_dev_support', '~> 2.5'
38
- s.add_development_dependency 'github_changelog_generator'
39
- s.add_development_dependency 'selenium-webdriver'
40
- s.add_development_dependency 'webdrivers'
36
+ spec.add_development_dependency 'solidus_dev_support', '~> 2.5'
41
37
  end
data/spec/features/admin/orders_spec.rb CHANGED
@@ -15,7 +15,6 @@ describe "Orders", type: :feature, js: true do
15
15
  bundle.parts << [parts]
16
16
  line_item.update!(quantity: 3)
17
17
  order.reload.create_proposed_shipments
18
- order.finalize!
19
18
  end
20
19
 
21
20
  if Spree.solidus_gem_version < Gem::Version.new('2.5')
data/spec/features/admin/parts_spec.rb CHANGED
@@ -14,17 +14,18 @@ describe "Parts", type: :feature, js: true do
14
14
  click_on "Update"
15
15
  end
16
16
 
17
- it "add and remove parts" do
17
+ it "can add and remove parts" do
18
18
  visit spree.admin_product_path(tshirt)
19
19
  click_on "Parts"
20
20
  fill_in "searchtext", with: mug.name
21
21
  click_on "Search"
22
+ click_on "Select"
23
+ expect(page).to have_link('Delete')
22
24
 
23
- within("#search_hits") { click_on "Select" }
24
- expect(page).to have_content(mug.sku)
25
+ expect(tshirt.reload.parts).to eq([mug.master])
25
26
 
26
- within("#product_parts") do
27
- find(".remove_admin_product_part_link").click
28
- end
27
+ click_on 'Delete', wait: 30
28
+ expect(page).not_to have_link('Delete')
29
+ expect(tshirt.reload.parts).to eq([])
29
30
  end
30
31
  end
data/spec/features/admin/return_items_spec.rb CHANGED
@@ -23,7 +23,7 @@ describe "Return Items", type: :feature, js: true do
23
23
  3.times { order.next }
24
24
  create :payment, order: order, amount: order.amount
25
25
  order.next
26
- order.complete
26
+ order.complete!
27
27
  order.payments.each(&:capture!)
28
28
  order.shipments.each { |s| s.update state: :ready }
29
29
  order.shipments.each(&:ship!)
@@ -51,7 +51,9 @@ describe "Return Items", type: :feature, js: true do
51
51
  click_link 'Customer Returns'
52
52
  click_link 'New Customer Return'
53
53
  find('#select-all').click
54
- page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
54
+ page.execute_script <<~JS
55
+ $('option[value="receive"]').attr('selected', 'selected');
56
+ JS
55
57
  select Spree::StockLocation.first.name, from: 'Stock Location'
56
58
  click_button 'Create'
57
59
 
@@ -88,7 +90,9 @@ describe "Return Items", type: :feature, js: true do
88
90
  click_link 'Customer Returns'
89
91
  click_link 'New Customer Return'
90
92
  find('#select-all').click
91
- page.execute_script %{$('option[value="receive"]').attr('selected', 'selected')}
93
+ page.execute_script <<~JS
94
+ $('option[value="receive"]').attr('selected', 'selected');
95
+ JS
92
96
  select Spree::StockLocation.first.name, from: 'Stock Location'
93
97
  click_button 'Create'
94
98
 
@@ -106,10 +110,15 @@ describe "Return Items", type: :feature, js: true do
106
110
 
107
111
  context 'when the product is not a bundle' do
108
112
  before do
109
- order.reload.create_proposed_shipments
110
- order.finalize!
111
- order.update state: :complete
112
- order.shipments.update_all state: :shipped
113
+ create :refund_reason, name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false
114
+ order.line_items.each { |li| li.variant.stock_items.first.set_count_on_hand 4 }
115
+ 3.times { order.next }
116
+ create :payment, order: order, amount: order.amount
117
+ order.next
118
+ order.complete!
119
+ order.payments.each(&:capture!)
120
+ order.shipments.each { |s| s.update state: :ready }
121
+ order.shipments.each(&:ship!)
113
122
  end
114
123
 
115
124
  context 'with a single item cart' do
@@ -125,7 +134,7 @@ describe "Return Items", type: :feature, js: true do
125
134
 
126
135
  within '.return-items-table tbody' do
127
136
  expect(page).to have_selector 'tr', count: 1
128
- expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 1
137
+ expect(page).to have_selector :field, class: 'refund-amount-input', with: '10.0', count: 1
129
138
  end
130
139
  end
131
140
  end
@@ -143,7 +152,7 @@ describe "Return Items", type: :feature, js: true do
143
152
 
144
153
  within '.return-items-table tbody' do
145
154
  expect(page).to have_selector 'tr', count: 2
146
- expect(page).to have_selector '.return-item-pre-tax-refund-amount', text: '$10.00', count: 2
155
+ expect(page).to have_selector :field, class: 'refund-amount-input', with: '10.0', count: 2
147
156
  end
148
157
  end
149
158
  end
data/spec/models/spree/inventory_unit_spec.rb CHANGED
@@ -29,7 +29,6 @@ module Spree
29
29
  before do
30
30
  product.parts << parts
31
31
  order.create_proposed_shipments
32
- order.finalize!
33
32
  end
34
33
 
35
34
  it 'will return the percentage of a line item' do
data/spec/models/spree/line_item_spec.rb CHANGED
@@ -51,7 +51,6 @@ module Spree
51
51
  before do
52
52
  product.parts << parts
53
53
  order.create_proposed_shipments
54
- order.finalize!
55
54
  end
56
55
 
57
56
  it "verifies inventory units via OrderInventoryAssembly" do
data/spec/models/spree/order_inventory_assembly_spec.rb CHANGED
@@ -17,7 +17,7 @@ module Spree
17
17
 
18
18
  line_item.update!(quantity: 3)
19
19
  order.reload.create_proposed_shipments
20
- order.finalize!
20
+ allow(order).to receive(:completed?).and_return(true)
21
21
  end
22
22
 
23
23
  context "inventory units count" do
@@ -36,7 +36,10 @@ module Spree
36
36
  it "inserts new inventory units for every bundle part" do
37
37
  expected_units_count = original_units_count + bundle.assemblies_parts.to_a.sum(&:count)
38
38
  subject.verify
39
- expect(described_class.new(line_item.reload).inventory_units.count).to eql(expected_units_count)
39
+
40
+ # needs to reload so that inventory units are fetched from the updated order.shipments
41
+ updated_units_count = described_class.new(line_item.reload).inventory_units.count
42
+ expect(updated_units_count).to eql(expected_units_count)
40
43
  end
41
44
  end
42
45
 
@@ -47,7 +50,7 @@ module Spree
47
50
  expected_units_count = original_units_count - bundle.assemblies_parts.to_a.sum(&:count)
48
51
  subject.verify
49
52
 
50
- # needs to reload so that inventory units are fetched from updates order.shipments
53
+ # needs to reload so that inventory units are fetched from the updated order.shipments
51
54
  updated_units_count = described_class.new(line_item.reload).inventory_units.count
52
55
  expect(updated_units_count).to eql(expected_units_count)
53
56
  end
data/spec/spec_helper.rb CHANGED
@@ -29,5 +29,3 @@ RSpec.configure do |config|
29
29
  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :system
30
30
  end
31
31
  end
32
-
33
- Capybara.javascript_driver = (ENV['CAPYBARA_DRIVER'] || :selenium_headless).to_sym
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_product_assembly
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Roman Smirnov
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-11-02 00:00:00.000000000 Z
11
+ date: 2023-06-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus_core
@@ -16,20 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 2.0.0
20
- - - "<"
21
- - !ruby/object:Gem::Version
22
- version: '4'
19
+ version: '3.2'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - ">="
28
25
  - !ruby/object:Gem::Version
29
- version: 2.0.0
30
- - - "<"
31
- - !ruby/object:Gem::Version
32
- version: '4'
26
+ version: '3.2'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: solidus_support
35
29
  requirement: !ruby/object:Gem::Requirement
@@ -72,49 +66,7 @@ dependencies:
72
66
  - - "~>"
73
67
  - !ruby/object:Gem::Version
74
68
  version: '2.5'
75
- - !ruby/object:Gem::Dependency
76
- name: github_changelog_generator
77
- requirement: !ruby/object:Gem::Requirement
78
- requirements:
79
- - - ">="
80
- - !ruby/object:Gem::Version
81
- version: '0'
82
- type: :development
83
- prerelease: false
84
- version_requirements: !ruby/object:Gem::Requirement
85
- requirements:
86
- - - ">="
87
- - !ruby/object:Gem::Version
88
- version: '0'
89
- - !ruby/object:Gem::Dependency
90
- name: selenium-webdriver
91
- requirement: !ruby/object:Gem::Requirement
92
- requirements:
93
- - - ">="
94
- - !ruby/object:Gem::Version
95
- version: '0'
96
- type: :development
97
- prerelease: false
98
- version_requirements: !ruby/object:Gem::Requirement
99
- requirements:
100
- - - ">="
101
- - !ruby/object:Gem::Version
102
- version: '0'
103
- - !ruby/object:Gem::Dependency
104
- name: webdrivers
105
- requirement: !ruby/object:Gem::Requirement
106
- requirements:
107
- - - ">="
108
- - !ruby/object:Gem::Version
109
- version: '0'
110
- type: :development
111
- prerelease: false
112
- version_requirements: !ruby/object:Gem::Requirement
113
- requirements:
114
- - - ">="
115
- - !ruby/object:Gem::Version
116
- version: '0'
117
- description: Adds opportunity to make bundle of products to your Spree store
69
+ description: Make bundle of products to your Solidus store
118
70
  email: roman@railsdog.com
119
71
  executables: []
120
72
  extensions: []
@@ -132,13 +84,12 @@ files:
132
84
  - CHANGELOG.md
133
85
  - Gemfile
134
86
  - LICENSE
87
+ - OLD_CHANGELOG.md
135
88
  - README.md
136
89
  - Rakefile
137
90
  - app/assets/images/spinner.gif
138
91
  - app/assets/javascripts/spree/backend/solidus_product_assembly.js
139
- - app/assets/javascripts/spree/frontend/solidus_product_assembly.js
140
92
  - app/assets/stylesheets/spree/backend/solidus_product_assembly.css
141
- - app/assets/stylesheets/spree/frontend/solidus_product_assembly.css
142
93
  - app/controllers/spree/admin/parts_controller.rb
143
94
  - app/decorators/helpers/solidus_product_assembly/spree/admin/orders_helper_decorator.rb
144
95
  - app/decorators/models/solidus_product_assembly/spree/inventory_unit_decorator.rb
@@ -225,13 +176,13 @@ files:
225
176
  - spec/models/spree/variant_spec.rb
226
177
  - spec/spec_helper.rb
227
178
  - spec/support/shared_contexts/order_with_bundle.rb
228
- homepage: https://solidus.io
179
+ homepage: https://github.com/solidusio-contrib/solidus_product_assembly
229
180
  licenses:
230
181
  - BSD-3-Clause
231
182
  metadata:
232
- homepage_uri: https://solidus.io
183
+ homepage_uri: https://github.com/solidusio-contrib/solidus_product_assembly
233
184
  source_code_uri: https://github.com/solidusio-contrib/solidus_product_assembly
234
- changelog_uri: https://github.com/SuperGoodSoft/solidus_product_assembly/blob/master/CHANGELOG.md
185
+ changelog_uri: https://github.com/solidusio-contrib/solidus_product_assembly/releases
235
186
  post_install_message:
236
187
  rdoc_options: []
237
188
  require_paths:
@@ -240,17 +191,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
240
191
  requirements:
241
192
  - - ">="
242
193
  - !ruby/object:Gem::Version
243
- version: '2.4'
194
+ version: '2.5'
195
+ - - "<"
196
+ - !ruby/object:Gem::Version
197
+ version: '4'
244
198
  required_rubygems_version: !ruby/object:Gem::Requirement
245
199
  requirements:
246
200
  - - ">="
247
201
  - !ruby/object:Gem::Version
248
202
  version: '0'
249
203
  requirements: []
250
- rubygems_version: 3.1.6
204
+ rubygems_version: 3.3.7
251
205
  signing_key:
252
206
  specification_version: 4
253
- summary: Adds opportunity to make bundle of products to your Spree store
207
+ summary: Make bundle of products to your Solidus store
254
208
  test_files:
255
209
  - spec/features/admin/orders_spec.rb
256
210
  - spec/features/admin/parts_spec.rb
data/app/assets/javascripts/spree/frontend/solidus_product_assembly.js DELETED
@@ -1 +0,0 @@
1
- //= require spree/frontend
data/app/assets/stylesheets/spree/frontend/solidus_product_assembly.css DELETED
@@ -1,3 +0,0 @@
1
- /*
2
- *= require spree/frontend
3
- */