raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,048 Commits 18 Branches 453 Tags
c00a35b5a4d819c69bb5aad6ad22aaa98b65e798
Commit Graph

377 Commits

Author SHA1 Message Date
Maikel
e59d753333 Merge pull request #9044 from georgethoppil/optional-restock-items 
Optional restock items
 2022-05-09 09:08:26 +10:00
GeorgeThoppil
8903496a1b Optional restocking items 2022-05-06 10:55:24 -04:00
Filipe
fb834d3143 Merge pull request #9138 from jibees/9137-order-shipping-methods-alphabetically 
Split checkout: Order shipping methods by name
 2022-05-05 12:41:12 +01:00
Filipe
664e2a5423 Merge pull request #9057 from jibees/9038-handle-payment-errors-on-split-checkout 
Split checkout: handle cards that throws any errors
 2022-05-02 12:20:02 +01:00
Filipe
ce9bd37c9b Merge pull request #9117 from jibees/9085-add-additionnal-items-in-/cart-page-for-split-checkout 
Split checkout: Unless order is complete, /cart could be updated
 2022-04-28 19:59:08 +01:00
Filipe
d57d812ab4 Merge pull request #9110 from georgethoppil/update-subscription-deleted-product 
Return if variant is deleted
 2022-04-28 15:54:51 +01:00
Jean-Baptiste Bellet
34fcb4a1f7 Order shipping methods by name 
+ create spec
 2022-04-27 16:37:37 +02:00
Jean-Baptiste Bellet
b370ee328a Click twice on "Next - Order summary" button 
yes, this is a hack, but can't make it work as a normal behavior. For testing purpose, we use `spec/support/fixtures/stripejs-mock.js` and it seems not working with our `app/webpacker/controllers/stripe_controller.js`
 2022-04-27 15:43:05 +02:00
Filipe
cb540d66c6 Merge pull request #9084 from jibees/9046-property-filter-on-shopfront 
Fix an issue which prevented filtering by properties and sorting by category on a shopfront.
 2022-04-22 11:03:31 +01:00
GeorgeThoppil
898c470c00 Change enterprise visibility scope 2022-04-21 20:27:28 -04:00
GeorgeThoppil
2046317f16 Allow update of subscriptions containing deleted products 2022-04-21 20:23:34 -04:00
Jean-Baptiste Bellet
9306e054b8 Unless order is complete, /cart could be updated 
Split_checkout introduced new state for an order

Update specs as well

Follow up #8944
 2022-04-21 14:22:39 +02:00
Jean-Baptiste Bellet
3e5656e638 Remove distinct to make proper ORDER BY 
Update specs as well to test match array and test duplication by adding property2 to product1
 2022-04-21 11:03:22 +02:00
Jean-Baptiste Bellet
e607d5c161 Shipping method: disabled form element to not submit them 
As they're not handled by the backend
 2022-04-19 15:16:07 +02:00
Jean-Baptiste Bellet
4b629eae11 Test that fee can be updated from weight to Flat Rate 
+ Missing some spree i18n keys
 2022-04-19 14:28:18 +02:00
Jean-Baptiste Bellet
6f5dd5ab0c Prepare to receive another test in the same context 2022-04-19 14:28:18 +02:00
Filipe
4dde49c881 Merge pull request #8991 from jibees/8985-Make-checkbox-for-Send-a-cancellation-email-to-the-customer-checked-by-default 
Admin, editing order, on last item deletion modal: "Send a cancellation email to the customer" checked by default
 2022-04-18 14:04:08 +01:00
Filipe
01e915800e Merge pull request #9037 from jibees/9028-last-item-of-order-cancellation 
BOM: show custom modal on last item deletion of an order
 2022-04-15 18:47:51 +01:00
Filipe
4009f3313f Merge pull request #8814 from Matt-Yorkley/tom-select 
Introduce new select/dropdown library
 2022-04-15 18:08:08 +01:00
Filipe
54d64c1c2c Merge pull request #8841 from apricot12/8790_display_stock_left_shop 
Display remaining stock in shopfront if enabled in shop preferences
 2022-04-15 17:58:40 +01:00
jibees
6ba255ce85 Merge pull request #9000 from filipefurtad0/adds_coverage_tags_on_details_step 
Adds basic coverage on tag functionality on payment methods
 2022-04-15 09:22:43 +02:00
Maikel
28de8bbb8d Merge pull request #9083 from filipefurtad0/updating_properties_specs 
Updating properties specs
 2022-04-15 11:25:32 +10:00
Nihal Mohammed
15e7a5a4df Rename product_stock_display to product_low_stock_display 
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
 2022-04-15 10:59:42 +10:00
Nihal Mohammed
66386683b6 Add system spec 
Fix linter errors
 2022-04-15 10:56:26 +10:00
filipefurtad0
029df03ee6 Improves naming and styling 2022-04-14 14:40:59 +01:00
filipefurtad0
c8b5ce64a4 Adds coverage for hiding payment methods with tags 2022-04-13 23:44:54 +01:00
filipefurtad0
aed757e349 Adds tests on shopfront ordering preference setting 2022-04-13 23:38:03 +01:00
filipefurtad0
18572cbbfa Adds sorting by product to reproduce #9046; sets assertion as pending 2022-04-13 23:38:03 +01:00
filipefurtad0
f3706bdb00 Adds taxon and property filtering 2022-04-13 21:55:23 +01:00
Maikel Linke
4d8c44d890 Include port in URLs generated by system specs 
This means that we can follow generated links, for example in emails and
reach the test app server.
 2022-04-13 15:03:38 +10:00
Maikel
26d6969b5b Merge pull request #9045 from jibees/9043-send-email-cancelation-by-default 
Send cancellation email by default when cancelling an order
 2022-04-13 11:53:43 +10:00
filipefurtad0
760e7ad6e2 Adds assertion on displaying/hidding the Properties tab 2022-04-11 22:30:54 +01:00
Matt-Yorkley
09bd7126d8 Replace/remove a custom select2 Angular directive 2022-04-05 18:56:51 +01:00
Matt-Yorkley
fedfeb6dd3 Add dropdown "primary" style with blue instead of white 2022-04-05 18:56:51 +01:00
Filipe
f29dc3f978 Merge pull request #9009 from jibees/9007-already-opened-cart 
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
 2022-04-01 13:29:34 +01:00
Filipe
c4fc8e9396 Merge pull request #8988 from jibees/8963-sc-display-save-shipping-address-as-default-checkbox 
SplitCheckout: Display checkbox that "save as default address" on the /details page
 2022-03-31 16:43:52 +01:00
Filipe
e2b1c0d93f Merge pull request #9004 from jibees/8999-filter-shipping-methods-with-tag 
SplitCheckout: filter shipping method with tag
 2022-03-31 12:09:06 +01:00
Jean-Baptiste Bellet
20142ca632 Add a spec on canceling an order, and check email is sent 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-03-31 09:18:43 +02:00
filipefurtad0
f8b8298fbe Adds spec on billing address checkbox 2022-03-29 22:09:39 +01:00
Filipe
be1c255067 Merge pull request #8892 from Matt-Yorkley/spree-login-routes 
Fix issue with unconfirmed email messages
 2022-03-28 13:38:17 +01:00
Matt-Yorkley
ad5c834342 Merge pull request #8995 from apricot12/7853-deprecation-warnings-1 
7853 deprecation warnings 1
 2022-03-25 19:54:06 +00:00
Jean-Baptiste Bellet
17989b2f90 Update tests as well around order cancellation on item deletion 
js specs are not that easy to code (needs to spy callback...). Use system spec instead.
 2022-03-25 11:52:08 +01:00
Filipe
6d0d57a4d2 Merge pull request #8960 from filipefurtad0/covers_default_addresses 
Covers default billing address checkbox behavior
 2022-03-22 09:10:42 +00:00
Filipe
87c79a5941 Merge pull request #8294 from guidoDutra/8131-cancel-empty-orders-on-BOM-page 
Cancel empty orders on BOM page
 2022-03-18 11:24:26 +00:00
filipefurtad0
7bdf814d7d Uses change helper to remove before block; 
Adds a & - Safe Navigation Operator - to the customer object
 2022-03-17 19:31:40 +00:00
Jean-Baptiste Bellet
621933c727 Improve spec by creating its opposite 
ie. when distributor don't allow order changes
 2022-03-17 16:47:16 +01:00
filipefurtad0
790bcc9ff2 Adds spec on open order information 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
c9e40d084c Add spec around shipping methods filter for a guest + logged user 2022-03-16 11:14:02 +01:00
filipefurtad0
4bdce59648 Clarifies context 2022-03-15 16:30:38 +00:00
filipefurtad0
ba5bdf688c Removes new address assignment; uses change helper 2022-03-15 16:14:44 +00:00