Matt-Yorkley
3d4f0ebb7b
Ensure variants don't end up with invalid data when a product's variant_unit is changed
...
Fixes an issue where a product's variant_unit value is changed from "weight" to "items" and some of the product's variants can be left in an invalid state, which in turn breaks cloning of order cycles (with fatal errors).
2020-11-11 20:24:21 +00:00
Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa
Merge pull request #6272 from tsara27/fix-alignment-order
...
Align center order adjustment and order total title
2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591
Merge pull request #6307 from efgalvao/issue#6262
...
Fixes issue #6262 .
2020-11-05 18:31:49 +01:00
Matt-Yorkley
bc96ad9515
Merge pull request #6299 from Matt-Yorkley/admin-image-edit
...
Fix display issue in product image edit page
2020-11-05 18:28:10 +01:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
efgalvao
42d5f377e0
Fixes issue #6262 .
2020-11-04 13:11:37 -03:00
Luis Ramos
5cde085241
Fix a number of spree translations
2020-11-04 13:55:36 +00:00
Luis Ramos
23956726e9
Add missing translation
2020-11-04 12:37:55 +00:00
Luis Ramos
f6d0905517
Add s3_support require to image.rb
2020-11-04 12:15:45 +00: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
c785d0d1d7
Make engine's routes append to main app instead of prepend
2020-11-04 12:15:45 +00:00
Luis Ramos
80cbe6b30f
Add route helper to call to sort_link so that it can find the necessary routes
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Luis Ramos
805b4d243e
Fix missing translations
2020-11-04 12:15:45 +00:00
Luis Ramos
a07029f660
Add require so that model is available when needed
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
1b4a4a8113
Bring code from spree_paypal_express to make it use spree url_helper
2020-11-04 12:15:45 +00:00
Luis Ramos
79a7cf9b39
Add default spree logo
2020-11-04 12:15:45 +00:00
Luis Ramos
a18a198812
Fix locations of requires in admin js all.js
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
9bbeec5031
Require code from spree/core explicitly
2020-11-04 12:15:45 +00:00
Luis Ramos
af3057f55f
Remove spree requires that are not needed in OFN
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
795b7101ab
Remove spree requires that are not needed in OFN
2020-11-04 12:15:23 +00:00
Luis Ramos
9d4a15b0e0
Add required product scopes from spree_core product_scopes
2020-11-04 12:15:23 +00:00
Luis Ramos
459959c068
Remove code related to spree promotions
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
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
2f8198eecc
Fix some easy rubocop issues
2020-11-04 12:15:23 +00:00
Luis Ramos
f85044e035
Run rubocop autocorrect
2020-11-04 12:15:23 +00:00
Luis Ramos
751beceb34
Merge decorators with original spree files
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
Matt-Yorkley
d147996af6
Fix display issue in product image edit page
2020-11-03 18:41:09 +00:00
Matt-Yorkley
0af20e48b0
Add missing translation key for enterprise taxon ordering
2020-10-31 19:17:19 +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
7cc7c62232
Fix long lines
2020-10-30 16:14:39 +00:00
Luis Ramos
b6dc46a911
Fix rubocop issue by nesting module and class declarations
...
No file contents changed
2020-10-30 16:14:34 +00:00
Luis Ramos
71a181341b
Fix bug in terms_and_conditions_helper related to guest checkout where current_user is nil and T&Cs must be shown all the time
2020-10-30 15:09:13 +00:00
Luis Ramos
cf3f511f4d
Add directive spec to validate the dialog template is loaded on element click
2020-10-30 15:09:13 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
f7c07f492c
Make TCs file input onoy accept pdf files
2020-10-30 15:09:13 +00:00
Luis Ramos
9f17e4fd8f
Add upload timestamp to TCs upload form in enterprise business details
2020-10-30 15:09:13 +00:00
Luis Ramos
c980d22826
Make TCs link open in a new tab in the backoffice
2020-10-30 15:09:13 +00:00
