Luis Ramos
00841cb537
Merge pull request #3923 from luisramos0/prod_image_error
...
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
luisramos0
61c8859da8
Fix problem in array concatenation in orders helper and cover it with specs
2019-06-26 14:17:41 +01:00
luisramos0
e33ce235c4
Hide invoice links in order edit page if invoices are disabled
2019-06-26 14:17:41 +01:00
luisramos0
ec2f99a467
Refactor OrderHelper.order_links: extract some logic from order_links to make it more simple and pass rubocop tests
2019-06-26 14:17:41 +01:00
luisramos0
67b5f08b07
Refactor OrderHelper.order_links: extract links object to separate methods
2019-06-26 14:17:41 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
luisramos0
8b0296eae6
Use a single query to get filter_schedules_by_enterprise_id
2019-06-26 11:38:03 +01:00
Maikel Linke
980b4a86ab
Move shipment rescue to its own method
2019-06-26 10:48:51 +10:00
Matt-Yorkley
5100ad6b51
Improve #line_items_for logic and add more tests
2019-06-25 15:33:42 +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
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)
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
Matt-Yorkley
0a155da273
Avoid undefined method 'order' errors when removing lineitems from basket
2019-06-25 11:13:56 +01:00
Matt-Yorkley
ead0e1c08d
Store attributes list in constant
2019-06-25 10:20:59 +01:00
Matt-Yorkley
85b3d7dac5
Move attribute check to method
2019-06-25 10:19:05 +01:00
Matt-Yorkley
84040fd2a6
Allow import to proceed when updating a product and description is set
2019-06-25 10:19:05 +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
Maikel Linke
1e1e88fe51
Rescue checkout on shipping id conflict
...
Helps to investigate https://github.com/openfoodfoundation/openfoodnetwork/issues/3924
A better solution would be to move the update of shipments out of the
after_save callback and deal with it in controllers. Unfortunately,
that's a big and tricky task.
Since this exception is causing a lot of pain for some Australian
farmers, I introduced more logging here to understand the problem
better. The issue was observed in OFN v1 and may disappear with v2. But
we don't know that and should monitor it.
2019-06-21 16:05:54 +10: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
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
luisramos0
bcc02f35e7
Add new preference to invoice settings: enable invoices
2019-06-19 13:29:30 +01:00
Matt-Yorkley
08b2b19d5e
Improve handling of invalid characters in uploaded CSV files
2019-06-19 09:29:59 +01:00
Maikel Linke
d8ece7cd8b
First stored credit card becomes default again
...
A user can store their credit card when checking out. Due to a bug in
https://github.com/openfoodfoundation/openfoodnetwork/pull/3840 it
didn't become the default card any more. This behaviour is now restored.
If there is not default card yet, a new card added during checkout
becomes the default card.
2019-06-19 15:43:38 +10:00
luisramos0
160b535e2f
Make weight calculator compute 0 for variants with unit different from weight
2019-06-18 15:21:13 +01:00
luisramos0
e8eeb3d5dc
Further improve weight calculator code
2019-06-18 13:28:16 +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
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
35c8236c21
Add missing datepicker/cal.gif to ofn assets
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
