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
Jean-Baptiste Bellet
20d5c45b7a
Remove :debug tag
2022-03-10 15:53:19 +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
Maikel
e2f68dac54
Merge pull request #8977 from filipefurtad0/split_checkout_fees
...
Split-checkout transaction and shipping fees
2022-03-10 10:47:27 +11:00
filipefurtad0
16fcde7053
Fixes rubocop offenses
2022-03-08 23:13:24 +00:00
filipefurtad0
a6486c2701
Adds assertion on the order confirmation page
2022-03-08 23:12:05 +00:00
filipefurtad0
509a114d51
Adds coverage on transaction fees for split checkout
2022-03-08 23:10:48 +00:00
filipefurtad0
1fdd36e491
Adds coverage on shipping fees, on split checkout
2022-03-08 22:30:14 +00:00
Jean-Baptiste Bellet
0ccba7f144
As the product unit is 'g', we now display information in 'g'
2022-03-08 15:52:50 +01: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
1fe7ebcec2
Check uncheck save_bill|ship_address don't save bill|ship_address
2022-03-07 17:42:06 +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
e0e800a53f
Remove translations for checkout only from edit form and index for payment methods
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
Nihal Mohammed
b0fd333126
Added migration to update display_on column in spree_payment_methods table where string is 'front_end' to NULL
2022-03-07 17:32:23 +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
Filipe
be2898f5a2
Merge pull request #8916 from jibees/8894-login-during-guest-checkout
...
SplitCheckout: as guest user, after login should redirect to the first step of checkout
2022-03-07 09:20:12 +00:00
Filipe
80ad18a684
Merge pull request #8953 from jibees/8951-load-stripejs-in-test-environment
...
Change css selector from stripe elements in test environment.
2022-03-04 09:57:28 +00:00
Matt-Yorkley
6729119489
Fix Angular interpolation for translations with apostrophes
2022-03-03 20:59:04 +00:00
Jean-Baptiste Bellet
f8f57a31db
Use the right selector
...
In test env. we don't use the stripejs but a mock. Slightly different.
2022-03-03 14:14:39 +01:00
Filipe
0a9c3b1538
Merge pull request #8932 from filipefurtad0/change_paypal_spec
...
Clarifies context in checkout_paypal_spec and implements tests as shared examples
2022-03-02 12:21:13 +00:00
Maikel
9a8082e35c
Merge pull request #8947 from openfoodfoundation/dependabot/npm_and_yarn/karma-6.3.17
...
Bump karma from 6.3.16 to 6.3.17
2022-03-02 11:27:28 +11: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
e14dad1575
Update test on payment step
2022-03-01 14:51:24 +01:00
Jean-Baptiste Bellet
3e85762143
Create a test that test the redirection after the split checkout login
...
Should be redirected on the first step
2022-03-01 14:25:41 +01:00
Jean-Baptiste Bellet
96d4ee3f4f
Extract to a method in the split checkout helper
2022-03-01 14:25:08 +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
dependabot[bot]
f573423d3a
Bump karma from 6.3.16 to 6.3.17
...
Bumps [karma](https://github.com/karma-runner/karma ) from 6.3.16 to 6.3.17.
- [Release notes](https://github.com/karma-runner/karma/releases )
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md )
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.16...v6.3.17 )
---
updated-dependencies:
- dependency-name: karma
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2022-03-01 09:05:25 +00: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
c44de8dbb3
Merge pull request #8937 from openfoodfoundation/dependabot/npm_and_yarn/url-parse-1.5.10
...
Bump url-parse from 1.5.7 to 1.5.10
2022-03-01 11:26:43 +11:00
Maikel Linke
e266475cde
Mark style violation as tech debt
...
There's an issue for it already and we want devs to be able to run
rubocop without seeing any issues they didn't introduce.
2022-03-01 11:21:31 +11:00
Filipe
1338bcbf57
Merge pull request #8939 from filipefurtad0/stock_spec_checkout_split
...
Checks stock restrictions on checkout split (system spec)
2022-02-28 16:42:58 +00:00
Filipe
d84b6ce2ad
Merge pull request #8772 from filipefurtad0/add_specs_split_checkout_payment
...
[Split Checkout] Adds tests on payments
2022-02-28 16:42:12 +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
jibees
eeae67e2d0
Merge pull request #8935 from mkllnk/clean-rubocop
...
Relax our style guide
2022-02-28 15:16:46 +01:00
Filipe
499ad982c3
Merge pull request #8938 from filipefurtad0/controller_spec_checkout_split
...
Adds controller coverage for stock restrictions on split checkout
2022-02-28 10:32:46 +00:00
filipefurtad0
f6304892c2
Adds controller coverage for stock restrictions
2022-02-27 22:01:48 +00:00
filipefurtad0
7a6f3d67e2
Implements shared example; Checks stock restriction on payment step
2022-02-27 21:51:03 +00:00
filipefurtad0
eb56027505
Moves out-of-stock block within correct context
2022-02-27 19:56:45 +00:00
