luisramos0
1d92d6cc33
Remove unused api endpoint order_cycles and also action enterprises/managed and respective views
2019-07-22 17:35:41 +01:00
Luis Ramos
a6a695660f
Merge pull request #4002 from luisramos0/more_rails4
...
Adapting queries in permissions to Rails 4
2019-07-19 15:17:01 +01:00
Luis Ramos
4831bae9cb
Merge pull request #3953 from mkllnk/3727-first-credit-card-default
...
First stored credit card becomes default again
2019-07-19 12:12:09 +01:00
luisramos0
f2ac354e00
Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it
2019-07-18 14:29:38 +01:00
luisramos0
81482683cf
Extract method in subs controller
2019-07-17 12:08:51 +01:00
luisramos0
57f1742f24
Save subscription form on subs unpause so that proxy orders and orders are synced
2019-07-17 12:08:48 +01:00
Maikel
a1f8530489
Merge pull request #3962 from luisramos0/first_view_spec
...
First 2 view specs in OFN
2019-07-17 10:57:58 +10:00
luisramos0
3b467dbae8
Adapt line_item_syncer to the case where item is not added to the completed order because of insufficient stock and the subscription quantity is updated for that item afterwards
2019-07-16 12:08:08 +01:00
luisramos0
306390440a
Revert "Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item"
...
This reverts commit d153e58933
2019-07-16 11:00:21 +01:00
luisramos0
267131626e
Fix typo and add test case to cover out of stock case
2019-07-16 10:58:25 +01:00
Luis Ramos
2280b15664
Merge pull request #4035 from kristinalim/fix/4033-remove_line_item_adjustments_when_line_item_removed
...
4033 Remove line item adjustments when line item removed
2019-07-16 09:54:33 +01:00
luisramos0
a6655623d0
New admin orders edit view spec and workaround (current_ability) to make view specs work
2019-07-15 21:59:36 +01:00
luisramos0
2a2d05ad39
First view spec in OFN testing the print invoice button display in the orders list page
2019-07-15 21:59:36 +01:00
luisramos0
02099ebdae
Remove details about stock in line_item_syncer so that we avoid confusing the user with stock numbers, this way the user will know what is the problem and can check stock levels and the order for more details
2019-07-14 21:40:57 +01:00
luisramos0
d153e58933
Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item
2019-07-14 20:59:42 +01:00
luisramos0
2a1011921b
Reuse line_item_syncer.add_order_update_issue in line_item_syncer.update_item_quantities to add stock info to the update_quantity order issues
2019-07-14 16:43:46 +01:00
luisramos0
c2851015ce
Fix deleting created item (destroy doesnt work before save) and add order_update_issue with message so that user can understand what happened
2019-07-14 15:58:00 +01:00
luisramos0
d0c246c345
Fix some rubocop issues
2019-07-14 12:28:32 +01:00
luisramos0
6aed9ba549
Make line_item_syncer delete new line items if stock is insufficient
2019-07-13 22:57:13 +01:00
luisramos0
4f2bc33ec3
Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed
2019-07-13 20:56:34 +01:00
Kristina Lim
2c279fd02d
Remove line item adjustments if line item deleted
2019-07-13 03:58:01 +10:00
Kristina Lim
8a048cc155
Add proof line item adjustments remain after line item removal
2019-07-13 01:43:07 +08:00
Luis Ramos
39475be792
Merge pull request #4030 from Matt-Yorkley/line_item_errors
...
LineItems can always access soft-deleted variants
2019-07-12 16:33:36 +01:00
luisramos0
71b648e9fa
Add some tests to features/admin/users_spec from spree_auth_devise
2019-07-12 10:02:40 +01:00
luisramos0
eacd76bfa4
Add spec to features/admin/products_spec from spre_auth_devise
2019-07-11 19:47:17 +01:00
luisramos0
791ff842aa
Add some tests to models/spree/user_spec from spre_auth_devise
2019-07-11 19:39:31 +01:00
luisramos0
ac0123734a
Add some tests from spree/users_controller_spec from spree_auth_devise
2019-07-11 18:33:18 +01:00
luisramos0
7cab99efdf
Run transpec on users_controller
2019-07-11 18:07:23 +01:00
luisramos0
5378bb7b34
Add adapted version of spree/admin/users_controller_spec from spree_auth_devise
2019-07-11 17:45:56 +01:00
Matt-Yorkley
fb4e573cfa
Add a soft-deleted test in line_item_spec
2019-07-11 16:07:30 +01:00
Matt-Yorkley
b2c6e6271c
LineItems can always access soft-deleted variants
2019-07-11 11:33:34 +01:00
Luis Ramos
cdd36eeefc
Merge pull request #3674 from Matt-Yorkley/spree2/import_description
...
Allow import to proceed when updating a product and `description` is set
2019-07-10 21:09:30 +01:00
Luis Ramos
23b6267e30
Merge pull request #3916 from luisramos0/schedules_of_coordinator
...
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
Luis Ramos
6872ccfb72
Merge pull request #3963 from luisramos0/hide_invoices
...
Hide invoices feature
2019-07-09 14:20:50 +01:00
luisramos0
95832c96ac
Delete redundant spec, this case is now covered in a view spec
2019-07-09 09:15:38 +01:00
Jon Leighton
4398ea12b8
Convert several fields from string to text
...
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955
Fixes #3192 .
I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
luisramos0
1681e8a572
Remove unused auth config
2019-07-08 14:06:01 +01:00
luisramos0
17448699f9
Bring devise initializer from spree_auth_devise and fix spree initializer details
2019-07-05 22:45:59 +01:00
Pau Perez
8ab77b077b
Fix spec
...
This needs to be revisited. I'm not sure it's the most appropriate spec
as it seems to be testing just part of story.
2019-07-05 18:19:58 +02:00
Pau Perez
4a67ffab25
Add a test case for reports with deleted products
2019-07-04 17:01:06 +02:00
luisramos0
a57a93d414
Adapt permissions.rb and order_cycle_permissions to rails 4
2019-07-03 20:18:01 +01:00
Luis Ramos
951787d456
Merge pull request #3987 from mkllnk/3978-optimise-products-cache
...
3978 Optimise products cache
2019-07-03 19:59:07 +01:00
Luis Ramos
b35743b6e4
Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
...
Rescue checkout on shipping id conflict
2019-07-03 19:56:24 +01:00
Pau Pérez Fabregat
b3b66d5825
Merge pull request #3970 from mkllnk/444-feature-toggle-use-env
...
Toggle features via env instead of initializer
2019-07-03 16:27:01 +02:00
Maikel Linke
73372a58ef
Remove unused and dangerous Exchange#eql? override
...
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.
I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel
592a468448
Merge pull request #3960 from mkllnk/test-spec-stability
...
Remove retries from previously flaky specs
2019-07-02 13:50:16 +10:00
Luis Ramos
5ecab7a0c2
Merge pull request #3971 from Matt-Yorkley/basket_errors
...
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba
Merge pull request #3932 from luisramos0/shpfront_message
...
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
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
