raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,691 Commits 18 Branches 451 Tags
31b60ca0697eecdca145fae151aafc7c4066da49
Commit Graph

13093 Commits

Author SHA1 Message Date
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
Jean-Baptiste Bellet
f47de45346 Reference splitcheckout as a checkout redirect 
This stored in session value is used to redirect after login

Update tests as well, thanks @filipefurtad0 ! 🙏
 2022-03-01 15:12:18 +01:00
Jean-Baptiste Bellet
2976b0717c Display "Update" button on the order table page unless order is complete 
With the split checkout, we can access this page between the different steps: for this cases, cart actions should be displayed
 2022-03-01 10:11:27 +01:00
Filipe
d052c4f8a4 Merge pull request #8869 from filipefurtad0/remove_signup_string 
Removes signup string from private shop login screen
 2022-03-01 08:20:06 +00:00
Jean-Baptiste Bellet
e47198f1e5 Handle both types of redirection 
One is based on the order step itself, the other is based on the current step passed through the params
 2022-02-28 15:23:37 +01:00
Maikel Linke
b999673dfc Remove old version of relaxed styled guide 
We had an old version under "contested settings" and it looks like some
of them were modified. I hope that our new, separate file will
discourage manual tweaks.

We can include the relaxed rules from a gem as well. Let's see if we
need that complexity one day.
 2022-02-25 10:51:54 +11:00
Maikel Linke
1d15f35522 Remove now unnecessary inline rubocop config 2022-02-25 10:46:51 +11:00
Filipe
36e3f1b7a6 Merge pull request #8883 from jibees/8475-send-email-when-payment-needs-authorization 
Backoffice order, using stripe payment: when card requires auth, send authorization email to guest user
 2022-02-24 13:07:31 +00:00
Filipe
385cd49964 Merge pull request #8876 from SarvarKh/product-import-validation 
Fix product import on existing, empty unit_type and variant_unit
 2022-02-21 23:20:04 +00:00
Filipe
28ac9d980c Merge pull request #8849 from jibees/render-pdf-with-stylesheet 
Create a new method pdf_stylesheet_pack_tag that actually include CSS in PDF files
 2022-02-21 23:09:21 +00:00
Filipe
dbf5eb76f8 Merge pull request #8689 from apricot12/Transaction_fee_when_crediting 
Revoke transaction fee if there is an amount to be credited in order
 2022-02-21 20:30:19 +00:00
Filipe
89dc9b938b Merge pull request #8864 from jibees/7934-display-tax-rate-for-shipping-on-invoice 
Display tax rate for shipping in alternative invoice model
 2022-02-21 20:02:44 +00:00
Filipe
7590b3ecf8 Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute 
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
 2022-02-21 19:04:08 +00:00
Filipe
9966b5b33c Merge pull request #8565 from jibees/8171-group-by-imperial-unit 
Handle imperial units in the Bulk Order Management interface
 2022-02-21 14:47:38 +00:00
filipefurtad0
cefd5db6eb Renames require_login_3_html key 2022-02-18 11:07:37 +00:00
filipefurtad0
27bc5805ae Removes signup string from private shop login screen 2022-02-17 13:19:31 +00:00
Matt-Yorkley
6c695df917 Merge pull request #8895 from Matt-Yorkley/cloned-subscription-syncing 
Sync subscriptions on newly-cloned order cycles
 2022-02-17 12:44:39 +00:00
Matt-Yorkley
9a27addd14 Merge pull request #8763 from openfoodfoundation/8577-split-name-column-in-customers-table 
Split name column in customers table
 2022-02-17 11:57:01 +00:00
Filipe
4dbf047647 Merge pull request #8871 from jibees/8827-preselect-shipping-method 
SplitCheckout: preselect the shipping/payment method if the only one available
 2022-02-17 10:54:20 +00:00
Jean-Baptiste Bellet
bcd306ebd4 Authorize payment email could be send to guest user 
Always send the email to the order.email value
 2022-02-17 09:40:28 +01:00
Jean-Baptiste Bellet
012e91879a preselect the only available shipping method 2022-02-17 09:33:23 +01:00
Jean-Baptiste Bellet
7be2f418d0 preselect the only available payment method 2022-02-17 09:33:23 +01:00
Matt-Yorkley
00fa84e3b5 Sync when switching from nil dates to open 2022-02-16 21:45:43 +00:00
Matt-Yorkley
5913720c85 Sync for both open and upcoming OCs when switching from closed 2022-02-16 18:33:09 +00:00
Matt-Yorkley
4592827261 Sync OC subscriptions if transitioning from closed to open 2022-02-16 13:03:27 +00:00
Matt-Yorkley
4260422ea7 Remove a couple of unnecessary memory assignments 2022-02-16 12:55:19 +00:00
Matt-Yorkley
d4488fdb3f Return early if OC is closed 2022-02-16 12:53:22 +00:00
Matt-Yorkley
8c8b9d1b23 Sync subscriptions on newly-cloned order cycles 2022-02-16 10:44:22 +00:00
Maikel Linke
d09ba16411 Associate customers again 
And simplify the before_validation actions.
 2022-02-16 10:23:23 +11:00
François Turbelin
554a8625e5 Refactor ensure_customer method 2022-02-16 10:23:23 +11:00
François Turbelin
4cb31d04a7 Repair specs with default values on ensure_customer method 2022-02-16 10:23:23 +11:00
François Turbelin
836a60a6c7 Add missing full_name bind to subscriptions serializer 2022-02-16 10:23:23 +11:00
François Turbelin
23776c7a3e Fix more specs 2022-02-16 10:23:23 +11:00