Andy Brett
d1a87f7ba0
add oz and lb as allowed units in product import
2020-09-17 06:34:07 -07:00
Luis Ramos
455111093d
Fix easy rubocop issues
2020-09-17 14:18:51 +01:00
Luis Ramos
405b317726
Merge ability and ability decorator
2020-09-17 14:18:45 +01:00
Luis Ramos
37c7d254e1
Fix rubocop issues
2020-09-17 14:10:37 +01:00
Luis Ramos
051ee0fd14
Run rubocop -a
2020-09-17 14:10:37 +01:00
Luis Ramos
c00c03737e
Bring user and ability related files from spree_core
2020-09-17 14:10:37 +01:00
Luis Ramos
4b597ada12
Fix easy rubocop issues
2020-09-17 14:06:51 +01:00
Luis Ramos
e0d731b92b
Remove unused email validator
2020-09-17 14:06:51 +01:00
Luis Ramos
03419bbc35
Remove all and use find_each instead!
2020-09-17 14:06:51 +01:00
Luis Ramos
7884dbfeb1
Revert rubocop autocorrect, each is needed here for find_each is not available for Arrays
2020-09-17 14:06:51 +01:00
Luis Ramos
8643cbd8ce
Delete unused order.merge! and fix specs
2020-09-17 14:06:50 +01:00
Luis Ramos
2cd066237d
Fix easy rubocop issues
2020-09-17 14:06:50 +01:00
Luis Ramos
94ad02abbe
Run rubocop autocorrect
2020-09-17 14:06:50 +01:00
Luis Ramos
3c5a35df27
Remove original email validator and keep only previous OFN validator
2020-09-17 14:06:50 +01:00
Luis Ramos
82a116a92f
We always define Spree.user_class
2020-09-17 14:06:50 +01:00
Luis Ramos
cc87e8c9a2
Remove code related to promotions
2020-09-17 14:06:50 +01:00
Luis Ramos
2a6d83b4dd
Remove confirm checkout step and it's additional removal
2020-09-17 14:06:50 +01:00
Luis Ramos
6900f7a46f
Merge decorators with original files from spree_core
...
EPIC COMMIT ALERT :-)
2020-09-17 14:06:50 +01:00
Luis Ramos
47d2f698ef
Bring models related to Order from spree_core
...
EPIC COMMIT ALERT :-)
2020-09-17 14:05:29 +01:00
Matt-Yorkley
77eaebc2a7
Merge pull request #5888 from andrewpbrett/imperial-auto-units
...
Allow US units on products/variants
2020-09-17 15:04:15 +02:00
Luis Ramos
1a513567f2
Fix easy rubocop issues
2020-09-17 13:59:41 +01:00
Luis Ramos
1df7890a0d
Use spree url_helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
d5d62894a5
Use spree url helpers
2020-09-17 13:59:41 +01:00
Luis Ramos
a34c18451c
Add spree helper
2020-09-17 13:59:41 +01:00
Luis Ramos
27fa04114e
Add require for gateway error
2020-09-17 13:59:41 +01:00
Luis Ramos
66f27aad32
Explicitly use spree url helpers for spree routes
2020-09-17 13:59:41 +01:00
Luis Ramos
e0cb7a29bf
Add helper prefix to helper calls
2020-09-17 13:58:45 +01:00
Luis Ramos
8707f51214
Remove unused helper
2020-09-17 13:58:10 +01:00
Luis Ramos
b84212023b
Require code from spree/core explicitly
2020-09-17 13:58:10 +01:00
Luis Ramos
01daf63fc6
Fix some problems with code that was relying on spree code
2020-09-17 13:57:05 +01:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Luis Ramos
f061545a92
Merge pull request #5995 from andresgutgon/fix/datetime-picker-ui-pick-the-right-translations-on-order-cycles
...
Fix date time picker translations on Order cycles screen
2020-09-17 11:50:37 +01:00
Luis Ramos
e99fdeb972
Merge pull request #5996 from andresgutgon/fix/iframe-shop-failing-because-jquery-is-not-loaded
...
Fix embedded shops failing javascript because jQuery is try to be accessed before being loaded
2020-09-17 11:32:08 +01:00
Luis Ramos
87d6a73e54
Merge pull request #5878 from luisramos0/shipping
...
[Bye bye Spree] Bring models shipping_method, shipping_rates, address and shipping_category from spree_core
2020-09-16 14:58:39 +01:00
Luis Ramos
f566c2127d
Merge pull request #5924 from luisramos0/basic_spree_core
...
[Bye bye spree] Bring base_helper and log_entry from spree core
2020-09-16 14:57:41 +01:00
Luis Ramos
6eb43053e9
Merge pull request #5925 from luisramos0/spree_core_user
...
[Bye bye spree] Bring classes related to users to OFN
2020-09-15 17:13:27 +01:00
Pau Pérez Fabregat
7006b0af4c
Merge pull request #6021 from Matt-Yorkley/concerns
...
Move concern to concerns directory
2020-09-15 17:45:24 +02:00
Luis Ramos
0d7b5cd32c
Merge pull request #5868 from luisramos0/taxonomies
...
[Bye bye Spree] Bring models taxon and taxonomy from spree_core
2020-09-14 20:45:04 +01:00
Matt-Yorkley
276fea6942
Fix rubocop offenses
2020-09-14 15:14:16 +01:00
Matt-Yorkley
c45dcad975
Move concern to concerns directory
2020-09-14 13:23:21 +01:00
Andy Brett
4123eb7c10
update specs; add specs to validate weight calculator preference is kg or lb
2020-09-12 11:53:45 -07:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Matt-Yorkley
9481876595
Fix line_item tax sum in OrderTaxAdjustmentsFetcher
2020-09-12 15:41:29 +01:00
Matt-Yorkley
7ddc53bb5b
Remove temporary debugging helpers added during the Rails 4 upgrade.
2020-09-12 12:25:43 +01:00
Luis Ramos
175b78b51f
Merge pull request #5827 from jeduardo824/bug/remove-environment-column-when-user-is-not-super-admin
...
Bug/4592 - Hide Environment column on Payment Methods page when user is not admin
2020-09-11 10:47:10 +01:00
Maikel
c5c542069f
Merge pull request #5951 from mkllnk/5785-js-error-reporting
...
5785 Notify Bugsnag when sending card to Stripe fails during checkout
2020-09-11 15:12:47 +10:00
Maikel
dc9e3aa1a0
Merge pull request #6010 from mkllnk/fix-module-declaration
...
Fix module declaration
2020-09-11 09:12:08 +10:00
Luis Ramos
6f59158153
Remove useless TODOs
2020-09-10 17:36:25 +01:00
Maikel Linke
94b903179e
Fix module declaration
...
Running script/prepare_imported_db.rb failed because
Spree::PaymentMethodDistributors couldn't be found. This problem is
described in the Rubocop docs:
https://rubystyle.guide/#namespace-definition
2020-09-10 16:12:17 +10:00
