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
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
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
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
Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Andy Brett
adb29a9c8f
add preferred_unit to weight shipping calculator
2020-09-07 08:41:48 -07:00
Andy Brett
5793f0103d
Revert "Add a per-pound calculator and a spec for it"
...
This reverts commit e8eadcbf39
2020-09-07 07:50:59 -07:00
Andy Brett
e8eadcbf39
Add a per-pound calculator and a spec for it
2020-09-06 09:03:06 -07:00
Luis Ramos
6e8fe080cb
Fix easy rubocop issues
2020-09-05 18:39:56 +01:00
Luis Ramos
5521b4bb04
Remove unused product filters
2020-09-05 16:43:27 +01:00
Luis Ramos
4183dda27e
Fix long line
2020-09-05 16:43:27 +01:00
Luis Ramos
57e74a4980
Fix rubocop issues
2020-09-05 16:43:27 +01:00
Luis Ramos
a1b64fe27b
Rubocop auto-correct
2020-09-05 16:43:27 +01:00
Luis Ramos
49060892e8
Merge decorators into original files from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
9175504bc1
Bring taxon, taxonomy and classification from spree_core
2020-09-05 16:43:27 +01:00
Luis Ramos
4931edc67c
Remove code related to promotions, we dont have promotions in OFN
2020-09-05 16:38:37 +01:00
Luis Ramos
51ed9a6b78
Fix comment and point out that it's a fix to a spree issue
2020-09-05 16:38:36 +01:00
Luis Ramos
b629a4f912
Make new specs pass
2020-09-05 16:38:36 +01:00
Luis Ramos
967380c542
Fix easy rubocop issues
2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1
Run rubocop autocorrect
2020-09-05 16:38:36 +01:00
Luis Ramos
da683e3ecf
Merge decorators with original code from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
aa46a4b5da
Bring models related to taxes and adjustments from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
d8165aeec1
Merge pull request #5987 from luisramos0/spree_core_without_ctrl_hlpers
...
Depend on version of spree without controller helpers
2020-09-04 17:18:17 +01:00
Luis Ramos
9c0c324835
Add some requires now required as spree does not contain controller helpers
2020-09-04 14:30:17 +01:00
Luis Ramos
d80a44ade0
Merge pull request #5867 from luisramos0/stock
...
[Bye bye Spree] Bring models stock_location and stock_movement from spree_core
2020-09-03 18:35:55 +01:00
Luis Ramos
e413920335
Move both OptionValueNamer and VariantAndLineItemNaming to app/services/variant_units
2020-09-03 09:11:00 -07:00
Andy Brett
55e448897f
use fewer sigfigs for ounces; add spec to option_value_namer
2020-09-03 09:11:00 -07:00
Andy Brett
e99799bca2
add ounces and round up for lbs
2020-09-03 09:11:00 -07:00
