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
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
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
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
Adrien Chauve
ca46359224
More fixes
2022-02-16 10:23:22 +11:00
Adrien Chauve
9b93102a96
More fixes
2022-02-16 10:23:22 +11:00
Adrien Chauve
ba6523bb76
Add Customer.full_name
2022-02-16 10:23:22 +11:00
Adrien Chauve
5ca4d549e7
Update customer creation
2022-02-16 10:23:22 +11:00
Jean-Baptiste Bellet
405b7e6e17
Handle tax rates for ShippingMethod
...
Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com >
2022-02-15 15:16:58 +01:00
Matt-Yorkley
8084ad0068
Extract a comment-method so the code conveys it's purpose
2022-02-15 12:17:08 +00:00
Nihal M. Kelanthodika
9215ccc353
Prevents creation of payment adnustment when refunding or crediting an order
2022-02-15 11:52:26 +00:00
Filipe
e9e5ad2221
Merge pull request #8865 from jibees/8769-use-the-user-in-the-request-to-check-flipper-constraint
...
Use the user in the request to check flipper constraint for split checkout urls
2022-02-14 19:38:27 +00:00
SarvarKhalimov
d69f42e940
Update app/models/product_import/entry_validator.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-02-15 00:10:32 +05:00
Filipe
2de2703e1f
Merge pull request #8868 from jibees/8852-improve-total-cell-design-on-order-summary-table
...
SplitCheckout : Improve design of the order summary table
2022-02-14 18:48:20 +00:00
Filipe
a9d7fa473e
Merge pull request #8870 from jibees/8853-handle-back-button-on-summary-page-for-the-split-checkout
...
Split checkout: handle the link for "Back to Payment method" button in the summary page
2022-02-14 18:29:11 +00:00
SarvarKhalimov
42a0a973ba
Fix product import on existing, empty unit_type and variant_unit
2022-02-13 18:28:21 +05:00
Matt-Yorkley
e5818955ff
Invalidate all incomplete payments when creating a new one, not just those in "checkout" state.
...
Looking at prod data; when a checkout submission fails due to something like a card being out of date, the payment's state seems to be "pending" and not "checkout", which means this mechanism fro invalidating old payments is potentially not working where it should.
2022-02-11 17:25:27 +00:00
Jean-Baptiste Bellet
43cd604405
Update to the right link the "Back to Payment method" button
...
+ create a spec as well
2022-02-11 15:01:53 +01:00
