Luis Ramos
|
118ed79070
|
Merge pull request #3904 from luisramos0/subs_stock
Fix ofn-on-hand directive and fix usage of variant.on_hand in subscriptions order factory
|
2019-06-25 20:25:06 +01:00 |
|
luisramos0
|
7e2bead54d
|
Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity
|
2019-06-25 14:50:03 +01:00 |
|
luisramos0
|
2b6e6c62dd
|
Simplify order_factory_spec by extracting copy pasted code to method
|
2019-06-25 14:50:03 +01:00 |
|
luisramos0
|
05a15d9441
|
Extract method to remove some copy pasted code in order_factory_spec
|
2019-06-25 14:50:03 +01:00 |
|
luisramos0
|
567196fe0e
|
Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
|
2019-06-25 14:50:03 +01:00 |
|
luisramos0
|
7bd32d4967
|
Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb), since then variant.on_hand does not return infinity if variant is on_demand
|
2019-06-25 14:47:47 +01:00 |
|
Luis Ramos
|
9b6f1a5e11
|
Merge pull request #3958 from Matt-Yorkley/pi_encoding
Improve handling of invalid characters in uploaded CSV files
|
2019-06-25 14:44:32 +01:00 |
|
Maikel
|
723499332a
|
Merge pull request #3006 from mkllnk/i18n-error-detection
Raise error on missing translation keys
|
2019-06-25 16:13:15 +10:00 |
|
Maikel Linke
|
6a06e0ac3b
|
Raise error on missing translation keys
|
2019-06-25 15:06:56 +10:00 |
|
Luis Ramos
|
5600102729
|
Merge pull request #3876 from luisramos0/3804_insuf_stock
3804 Fix editing cart when variant on_demand but its on_hand value is zero or negative
|
2019-06-24 22:24:15 +01:00 |
|
luisramos0
|
a6ea975848
|
Fix editing cart when variant on_demand but on_hand is zero or negative
|
2019-06-24 22:07:46 +01:00 |
|
Luis Ramos
|
57917a498b
|
Merge pull request #3946 from luisramos0/missing_translatiojns
Fix last missing translations covered by specs
|
2019-06-24 20:52:59 +01:00 |
|
Luis Ramos
|
b30da27e92
|
Merge pull request #3950 from openfoodfoundation/dependabot/bundler/stripe-4.19.0
Bump stripe from 4.18.1 to 4.19.0
|
2019-06-24 20:44:57 +01:00 |
|
Maikel
|
e4c3c1664a
|
Merge pull request #3943 from jonleighton/issue-2112
Bring back ‘Shop for X products at:’ title
|
2019-06-21 15:06:21 +10:00 |
|
Maikel
|
5b0c8bbaef
|
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
Improve /shops, /producers, and /groups performance
|
2019-06-21 15:02:19 +10:00 |
|
Maikel
|
71f396a44f
|
Merge pull request #3896 from luisramos0/clear_unit_desc
Clear product.variants.unit_description if product.variant_unit is items
|
2019-06-21 15:00:06 +10:00 |
|
Maikel
|
eb162f6b29
|
Merge pull request #3934 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.2
Bump activerecord-import from 1.0.1 to 1.0.2
|
2019-06-21 14:59:03 +10:00 |
|
Maikel
|
5aea361d87
|
Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
Start upgrade to Rails 4
|
2019-06-21 14:58:24 +10:00 |
|
Maikel
|
3721c017fa
|
Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets
[Spree Upgrade] Remove dependency to spree frontend - routes and controllers
|
2019-06-21 14:57:03 +10:00 |
|
Maikel
|
12f0ed9955
|
Merge pull request #3940 from luisramos0/zones
Remove matching of shipping method zone to user address on checkout
|
2019-06-21 14:43:40 +10:00 |
|
Maikel
|
4c4881430c
|
Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import
3877,3843 Improve handling of units and unit type in product import
|
2019-06-21 14:43:01 +10:00 |
|
Matt-Yorkley
|
08b2b19d5e
|
Improve handling of invalid characters in uploaded CSV files
|
2019-06-19 09:29:59 +01:00 |
|
Matt-Yorkley
|
ab1ed53507
|
Merge pull request #3955 from openfoodfoundation/remove-travis-leftover
No need to keep old and used Travis config file
|
2019-06-18 16:48:13 +01:00 |
|
luisramos0
|
2b3865855d
|
Simplify shipping_method.include? method
|
2019-06-18 11:42:34 +01:00 |
|
luisramos0
|
1da18d3386
|
Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope
|
2019-06-18 10:52:56 +01:00 |
|
luisramos0
|
b025df1798
|
Fix a few more rubocop issues
|
2019-06-18 10:52:56 +01:00 |
|
luisramos0
|
178924af5d
|
Fix long lines in order_cycle model
|
2019-06-18 10:52:45 +01:00 |
|
luisramos0
|
bb1f7fde2f
|
Remove unused routes related to taxons
t/products was already an old route 4 years ago and t/*id is not currently working in master
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
c61e7a1672
|
Remove unused routes
This fix is in spree 2.1 here: ba420fe70e
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
3c964933b1
|
Remove stub of a deleted method #deadcode
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
e7b625edcf
|
Remove spree locale route
This route is not used, ofn code uses query param locale that is picked up in base controller set_locale
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
eab6cc563b
|
Fix rubocop issues
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
8daf9b9247
|
Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
5ba0f906a1
|
For some reason we need the orders populate route to make product import routes work
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
35c8236c21
|
Add missing datepicker/cal.gif to ofn assets
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
b397a8e661
|
Remove spree_frontend and spree_sample from ofn's gemfile
spree_frontend will only be removed from gemfile.lock when spree_auth_devise is removed from OFN
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
61def8f2e7
|
Convert match routes to get routes to be compatible with rails 4
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
4ff0bf8162
|
Change gemfile to depend on the different spree gems, not spree as a whole
|
2019-06-18 10:49:20 +01:00 |
|
luisramos0
|
02b9fca620
|
Remove unused spree checkout and spree cart routes
|
2019-06-18 10:49:19 +01:00 |
|
luisramos0
|
40f7d07e27
|
Remove unnecessary method from spree storecontroller and spree orderscontroller
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c56486d7ae
|
Remove unnecessary methods from spree checkoutcontroller
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
56db90f49e
|
Remove unused checkout controller update action and order controller populate action
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
a8b4037885
|
Remove dependency to coupon code logic in checkoutcontroller, ofn doesnt have that feature
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
fc145d472d
|
Add home controller to ofn codebase from spree frontend
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
5037cce6f5
|
Add all the code missing from checkout, order and store controllers to ofn controllers
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c399491314
|
Move spree frontend routes to ofn and transform decorators with class_eval to controller classes
|
2019-06-18 10:47:34 +01:00 |
|
luisramos0
|
c15c5435ff
|
Fix long lines in exchange model
|
2019-06-18 10:45:01 +01:00 |
|
luisramos0
|
0cdb49818d
|
Remove distinct from enterprise.ready_for_checkout scope
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
9548f5c5f7
|
Adapt order_cycle scopes to rail 4
|
2019-06-18 10:40:49 +01:00 |
|
luisramos0
|
ba91abd20e
|
Adapt exchanges.with_any_variant scope to rails 4
|
2019-06-18 10:40:49 +01:00 |
|