raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,824 Commits 18 Branches 452 Tags
d34ab71efaff02fa0f0d7ad8f8c8b0a48366bbfe
Commit Graph

13146 Commits

Author SHA1 Message Date
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
filipefurtad0
843f57ad4f Removes checkbox attributes 2022-03-29 22:29:43 +01:00
filipefurtad0
95b1911f38 Hides the default address checkbox for guest customers 2022-03-29 22:09:39 +01:00
Filipe
729e9eda66 Merge pull request #9013 from cillian/fix-order-cycle-advanced-settings-close-button 
Fix order cycle advanced settings close button so it uses new remote toggle StimulusJs controller instead of old toggleSettings method
 2022-03-28 14:10:11 +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
Filipe
a516193ca8 Merge pull request #9025 from MrFuku/fix-flash-message 
Fix untranslated flash message
 2022-03-28 13:18:47 +01:00
Maikel Linke
742ae761a3 Move helper statement to controller 
It's not available in concerns.
 2022-03-28 11:34:37 +11: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
jibees
9a5318965c Use as an helper 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-03-24 09:11:58 +01:00
MrFuku
7c1a4d6791 Fix untranslated flash message 2022-03-22 17:53:57 +09:00
Maikel
877002afd8 Merge pull request #8891 from mkllnk/api-customers 
Create API v1 with customers endpoint
 2022-03-22 19:37:23 +11: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
Filipe
19270f1777 Merge pull request #8987 from jibees/8981-BOM-correct-value-for-current-and-max-fullfilled 
BOM: correct max and current fulfilled units values
 2022-03-17 18:15:59 +00:00
Cillian O'Ruanaidh
1c80e88758 Fix order cycle advanced settings close button so it uses new remote toggle StimulusJs controller instead of old toggleSettings method 
Closes #9012
 2022-03-17 16:30:26 +00:00
Filipe
c535ed5789 Merge pull request #8936 from cillian/language-metatags 
Include language metatags in html template when more than one language available
 2022-03-17 16:16:07 +00:00
Filipe
53544ee66a Merge pull request #8805 from cillian/remove-inline-advanced-settings-toggle-js 
Replace inline JS for toggling order cycle advanced settings with StimulusJs controller
 2022-03-17 16:05:46 +00:00
Jean-Baptiste Bellet
df6cd5b266 Add already ordered panel only on summary step 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
6f6ad05ac2 Factorize some css rules for panel 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
ac361d3b64 Add already_opened on each step 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
13a45557a4 Load cart already opened boolean 
thanks to EnterprisesHelper
 2022-03-17 16:47:16 +01:00
Filipe
0dd398abba Merge pull request #8926 from mkllnk/8925-invalid-param 
Gracefully handle admin UI failure on updating enterprise notifications
 2022-03-17 14:19:34 +00:00
Jean-Baptiste Bellet
0948ce47ed Use EnterprisesHelper to retrieve shipping methods 
that apply tag filtering on shipping methods
 2022-03-16 11:10:46 +01:00
Nihal Mohammed
b3771bb623 Use bypass_sign_in method instead of bypass option in app/controllers/spree/users_controller.rb 2022-03-15 05:35:43 +05:30
Nihal Mohammed
ad52805a0d Change errors to be accessed by a block with single paramter instead of hash 2022-03-15 05:35:22 +05:30
Jean-Baptiste Bellet
ea3e15f0c8 Max|Current fulfilled value is the max|current divided by group_buy_unit_size 
+ improve testing with representative values
 + Update bulk_order_management_spec.rb and revert previously changed values
 2022-03-14 09:06:05 +01:00
Jean-Baptiste Bellet
bcf6c7984e Display checkbox that "save as default address" 2022-03-14 09:05:45 +01:00
jibees
04ed7e4a94 Merge pull request #8972 from jibees/8965-retrieve-scale-of-a-product-in-the-BOM-interface 
Improve the way we get the unit value (g, oz, lb, ...) in the Bulk Order Management interface
 2022-03-11 09:01:02 +01:00
jibees
d4a4a36b14 Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion 
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
 2022-03-11 08:56:41 +01:00
Filipe
6474055380 Merge pull request #8964 from jibees/8963-display-shipping-options-checkboxes 
SplitCheckout: Display shipping options checkboxes on invalid form submit
 2022-03-10 16:41:10 +00:00
Filipe
3cf2db68b1 Merge pull request #8945 from jibees/8914-do-not-display-shipping-method-backoffice-only-for-split-checkout 
SplitCheckout: display only shipping method that are set as front end available
 2022-03-10 16:13:42 +00:00
Filipe
1522263cfc Merge pull request #8893 from jibees/8889-handle-redirect-to-next-step-for-the-split-checkout 
SplitCheckout: handle navigation between steps
 2022-03-10 16:07:58 +00:00
Filipe
3e4b39c26b Merge pull request #8966 from jibees/8958-improve-use-of-checkboxes-values-in-split-checkout 
Splitcheckout: Don't save bill|ship address when associated checkbox is not checked during checkout process
 2022-03-10 15:48:27 +00:00
Jean-Baptiste Bellet
e3a529be5d Display only shipping method that are set as front end available 
and update the tests as well
 2022-03-10 16:15:50 +01:00
Jean-Baptiste Bellet
60ad92c4ff Display ship address options checkboxes 
+ Create the associated test: the trick is is that the selected delivery method is the one that required address **and** is before others that do not required ship address
 2022-03-10 15:55:10 +01:00
Filipe
6ce29f81d8 Merge pull request #8920 from apricot12/Remove_checkout_only_option_from_payment_methods_display 
Remove checkout only option from payment methods edit form.
 2022-03-10 14:38:45 +00:00
Jean-Baptiste Bellet
915714246f Directly use the variant_unit_scale instead of VariantUnitManager.getScale 
and update the tests as well
 2022-03-08 14:59:08 +01:00
Jean-Baptiste Bellet
adcdca812d Delete that getScale method which is now useless 
since we now rely on the serialized variant_unit_scale
 2022-03-08 14:58:34 +01:00
Jean-Baptiste Bellet
aa71e12020 Serialize variant_unit_scale to be used in the Bulk Order Managment 
to retrieve scale of the product
 2022-03-08 14:55:25 +01:00
Jean-Baptiste Bellet
440e5aaf97 Default checked/unchecked values for checkbox is 0/1 2022-03-07 17:41:05 +01:00
Filipe
53d1994b2a Merge pull request #8956 from Matt-Yorkley/welsh-javascript-fixes 
Fix Angular interpolation for translations with apostrophes
 2022-03-07 12:23:04 +00:00
Nihal Mohammed
e2bdc69a90 Update available_payment_methods method in enterprises_helper and order model 2022-03-07 17:33:09 +05:30
Nihal Mohammed
3820d4c591 Removed checkout only from DISPLAY options on payment method edit form and updated payment_method_spec 2022-03-07 17:33:09 +05:30
Filipe
5606be7199 Merge pull request #8944 from jibees/8940-display-update-button-on-order-unless-order-is-complete 
Split checkout: Display "Update" button on the order table page unless order is complete
 2022-03-07 11:58:34 +00:00
Matt-Yorkley
6729119489 Fix Angular interpolation for translations with apostrophes 2022-03-03 20:59:04 +00:00
Maikel Linke
12d989568e Safer API error reporting 
We don't know what unknown errors would report. They could expose
sensitive data. So let's not pass that data on to the public while we
have the full details in Bugsnag.

Also, let's not catch Exception because that could catch interrupts to
gracefully shut down the application.
 2022-03-02 11:59:35 +11:00
Maikel Linke
4aa70c1ffd Render pagination errors 2022-03-02 11:59:35 +11:00
Maikel Linke
b89715149c Sanitise pagination input for new API 2022-03-02 11:59:35 +11:00
Maikel Linke
414bf5d074 Don't list guest customer records to guest users 2022-03-02 11:59:35 +11:00