Luis Ramos
9bbef16804
Converting all calls to ActiveRelation#sum to use a symbol with &
...
This is only applicable to database columns, if we are summing using a method in the model than the & is required!
2020-11-27 13:59:46 +00:00
Matt-Yorkley
3bfa903912
Revert "Move Spree::Admin::BaseController to Admin::BaseController"
2020-11-27 14:11:57 +01:00
Andy Brett
85d99f3bf2
Merge branch 'master' into controllers
2020-11-20 08:12:03 -08:00
Pau Pérez Fabregat
6db80e837b
Merge pull request #6361 from andrewpbrett/fix-gateway-error-error
...
move gateway_error require to lib/spree/core.rb
2020-11-13 13:15:13 +01:00
Maikel
d96216b8d7
Merge pull request #6268 from yihyang/master-yy-added-product-sorting
...
Sort products alphabetically in OC edit/create page
2020-11-13 13:29:54 +11:00
Maikel
591ba34eb6
Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import
...
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
2020-11-13 13:28:17 +11:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Pau Pérez Fabregat
692adb0113
Merge pull request #6336 from coopdevs/fix-shop-layout
...
Fix .top-bar-section not to wrap the icons-menu
2020-11-11 17:29:53 +01:00
Andy Brett
17202ff39c
move gateway_error require to lib/spree/core.rb
2020-11-10 14:55:56 -08:00
Andy Brett
d5037abbe7
add specs for new/edit product pages
2020-11-10 10:49:14 -08:00
Pau Perez
17abb3e345
Fix feature specs
...
The underlying markup and CSS changed but the tests did not.
2020-11-09 15:43:54 +01:00
Matt-Yorkley
d9e2a80a4f
Improve flaky order cycle spec
...
There are various points in this spec where content is dynamically added to the DOM, but Capybara is jumping ahead to start interacting with it before it as actually finished loading.
2020-11-09 11:26:12 +00:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Cillian O'Ruanaidh
89d63dfbb9
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
...
Before when you imported inventory and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant override was also set to be on demand the inventory would still be available for sale. This change makes sure the on demand setting is turned off too.
Fixes #6289 .
2020-11-06 14:57:31 +00:00
Luis Ramos
b281e7e9e5
Merge pull request #6312 from mkllnk/variant-override-loading
...
Avoid loading variant overrides for no reason
2020-11-06 03:59:33 +00:00
Luis Ramos
bd4da3b5ce
Merge pull request #6247 from cillian/deep-munge-issue
...
Patch Rails :deep_munge issue so empty array parameters don't get converted to nil
2020-11-05 13:25:39 +00:00
Pau Pérez Fabregat
8e3f0d2152
Merge pull request #6134 from Matt-Yorkley/webmock-helper
...
Improve Webmock debugging
2020-11-05 13:11:02 +01:00
Maikel Linke
4b1f5ae060
Avoid loading variant overrides for no reason
2020-11-05 14:31:19 +11:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
5c4ea1a6be
Fix tax rates spec
2020-11-04 12:15:45 +00:00
Luis Ramos
72c454a211
Fix reference to Spree bug
2020-11-04 12:15:45 +00:00
Luis Ramos
543a9592c7
Adapt spec to routes without spree
2020-11-04 12:15:45 +00:00
Luis Ramos
2ce96f4bbe
Registration path is working correctly again without spree
2020-11-04 12:15:45 +00:00
Luis Ramos
4125fe1690
Fix problem with string matchers
2020-11-04 12:15:45 +00:00
Luis Ramos
ab53db0c61
Merge ability and ability decorator
2020-11-04 12:15:45 +00:00
Luis Ramos
b7aa04353c
Fix requires of product duplicator
2020-11-04 12:15:45 +00:00
Luis Ramos
1bce516a45
Make specs load product duplicator
...
This makes the ofn version of the product duplicator be used instead of the spree one
2020-11-04 12:15:45 +00:00
Luis Ramos
f6195f1159
Remove duplicate_extra logic from ProductDuplicator
2020-11-04 12:15:23 +00:00
Luis Ramos
503c17f896
Move Spree::ProductDuplicator to Spree::Core namespace
2020-11-04 12:15:23 +00:00
Luis Ramos
72a39fdf54
Add required factory from spree_core
2020-11-04 12:15:23 +00:00
Luis Ramos
4b8515358c
Remove reference to FactoryGirl, it's FactoryBot that is used in OFN
2020-11-04 12:15:23 +00:00
Luis Ramos
cf7d8067df
Fix easy rubocop issues
2020-11-04 12:15:23 +00:00
Luis Ramos
d4e4669e49
Run transpec
2020-11-04 12:15:23 +00:00
Luis Ramos
e9f76cb339
Remove some dead code (Config.track_inventory_levels), remove variant.cost_price= so that localized number is seen, and fix specs
2020-11-04 12:15:23 +00:00
Luis Ramos
b68c5ee0f9
Remove dead code (prototypes) and fix specs
2020-11-04 12:15:23 +00:00
Luis Ramos
072cd2bd54
Run rubocop autocorrect in specs
2020-11-04 12:15:23 +00:00
Luis Ramos
8cb75fc6d8
Bring models from spree_core: Spree::Product and Spree::Variant!
...
EPIC COMMIT ALERT :-)
2020-11-04 12:15:23 +00:00
Pau Pérez Fabregat
4911bb6613
Merge pull request #6274 from luisramos0/rubocop
...
Use rubocop auto correct to fix a number of issues
2020-11-02 22:13:36 +01:00
Luis Ramos
fa77204e14
Adapt spec to the move of the controller, in prod the call to request.env['PATH_INFO'] will work correctly
2020-10-31 10:44:19 +00:00
Luis Ramos
c9972189d0
Change usage of Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:56:59 +00:00
Luis Ramos
eb07a91acb
Adapt code from Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:52:34 +00:00
Luis Ramos
66ba9ff73d
Move Spree::Admin::BaseController to Admin::BaseController
2020-10-31 09:51:37 +00:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Luis Ramos
c2c12b34f9
Fix more rubocop issues with auto correct
2020-10-30 17:10:23 +00:00
Luis Ramos
c71ebc38bb
Fix Layout/ArgumentAlignment
2020-10-30 17:06:08 +00:00
Luis Ramos
b0e889be2a
Fix Style/RandomWithOffset
2020-10-30 16:50:37 +00:00
Luis Ramos
b3196295e6
Fix Style/RaiseArgs
2020-10-30 16:50:37 +00:00
Luis Ramos
75cec3b606
Fix issue Style/HashSyntax
2020-10-30 16:50:37 +00:00
Luis Ramos
92417d849c
Fix rubocop issue Rails/DynamicFindBy
2020-10-30 16:50:37 +00:00
Luis Ramos
bf5fcde885
Fix Lint/UnusedMethodArgument
2020-10-30 16:50:37 +00:00
