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
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
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
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
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
Jean-Baptiste Bellet
8624fa2a85
On last item deletion, prevent user on order canceling and cancellation email
...
... with a modal.
User can cancel the modal or confirm the last item deletion & order cancelation with or without sending a cancellation email to the consumer.
2022-02-10 14:39:00 +01:00
Jean-Baptiste Bellet
17906f378a
Create a method that actually adjust Items
...
Separate it from the adjustItems method that previously test about the item quantity
2022-02-10 14:34:39 +01:00
Filipe
998f7afdc4
Merge pull request #8523 from seballot/progress-for-ajax-request
...
Improve loading spinner display
2022-02-01 10:03:04 +00:00
Filipe
53b96896a9
Merge pull request #8779 from mkllnk/7872-remove-stripe-connect
...
Upgrade old Stripe Connect payment methods to Stripe SCA and remove Stripe Connect
2022-01-26 11:57:26 +00:00
Filipe
1ddff2c4bf
Merge pull request #8678 from Matt-Yorkley/dead-code-js-uri
...
Remove outdated jsUri
2022-01-24 13:15:02 +00:00
Maikel Linke
ee85b9654d
Remove references to StripeConnect class
2022-01-24 12:35:45 +11:00
Sebastian Castro
4a436978a9
loading-popup: debounce display
2022-01-11 21:55:07 +01:00
Jean-Baptiste Bellet
a1b21d7706
Take into account the lb unit name
2022-01-10 11:50:40 +01:00
Jean-Baptiste Bellet
c5beff249e
Should be divided by scale if the smallest unit
2022-01-10 11:27:18 +01:00
Jean-Baptiste Bellet
4c508a5bf9
Group by unit size is specific: it needs to be divided by scale if not the smallest unit
2022-01-10 11:24:22 +01:00
Jean-Baptiste Bellet
da9c0f4b8c
Refactor: create two internal methods: getScale and getFormattedValueWithUnitName
...
Then, the old formattedValueWithUnitName calls those two private methods
2022-01-10 11:23:30 +01:00
Jean-Baptiste Bellet
467183af48
Rename getScale to getLineItemScale to be more specific
2022-01-10 11:22:11 +01:00
Jean-Baptiste Bellet
515e2cfc51
Multiply by unit_value as sumOfUnitValues is now scaled
2022-01-07 10:32:47 +01:00
Jean-Baptiste Bellet
b746eacd11
Both sumUnitValues and sumMaxUnitValues should handle imperial units
2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
5db50481dd
Rounding to 3 decimals as scope method
2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
7b2a9df326
Handle unitsVariant when calling formattedValueWithUnitName
...
- unitsVariant was unread but is necessary to compute the unit_name thanks to `VariantUnitManager.getUnitName()`
2022-01-07 10:32:46 +01:00
Matt-Yorkley
14a62f5d49
Change paths helpers to urls
2022-01-06 13:10:48 +00:00
Matt-Yorkley
95464cf956
Update uses of (removed) jsuri interface
2022-01-06 13:10:48 +00:00
Matt-Yorkley
0721800f56
Remove jsuri.js
2022-01-06 13:10:48 +00:00
Matt-Yorkley
49ab74e472
Remove unused JS
2022-01-05 15:25:55 +00:00
SuprajaR
f3f7fba855
Replacing text with translation
2022-01-03 22:28:56 +05:30
Filipe
20c0195584
Merge pull request #8017 from cillian/hide-variants-with-no-stock
...
When creating backoffice orders hide variants with no stock by default
2021-12-23 21:34:06 +00:00
Filipe
fd94f26765
Merge pull request #8557 from Matt-Yorkley/card-brand-formatting
...
Credit card brand formatting
2021-12-15 20:18:21 +00:00
Matt-Yorkley
4cdb892c75
Refactor formatting of credit card brand names and reformat automatically when saving
...
This little bit of "translation" between what we might receive as input and what ActiveMerchant requires is important, but currently the responsibility for this job is spread all over the code base. It can now just live in the CreditCard model (in one place) and doesn't need to be duplicated anywhere else (like several different places in frontend Javascript!)
2021-12-02 16:22:52 +00:00
Jean-Baptiste Bellet
59eb91c7c8
Remove id "card-element" as well
2021-11-29 10:18:06 +01:00
Jean-Baptiste Bellet
b6afdb13fc
Use timeout to put in other callback and then update the StatusMessage
2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5575697c9f
Add a directive attribute 'selected' that update AdminStripeElements when true
...
Filled with `PaymentCtrl.isSelected(payment_method_id)`
Therefore, each time a stripe payment is selected, the one that is actually selected is linked to `AdminStripeElements.card` and `AdminStripeElements.stripe`
2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
5348d26054
Add new "error" attribute in the StatusMessage
...
It is used by `admin/payments/services/stripe_elements.js.coffee`
2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
36c12a92f2
Display errors on the right specific DOM element
2021-11-22 21:39:20 +01:00
Jean-Baptiste Bellet
fc779e0237
Mount Stripe element to the specific DOM element
2021-11-22 21:39:20 +01:00
Guido Oliveira
db45d7f4eb
Cancel empty orders on BOM page
2021-11-06 10:25:34 -03:00
Matt-Yorkley
8cb2a2cc96
Merge pull request #8451 from Matt-Yorkley/variant-search-debounce
...
Fix debounce on variant search dropdown
2021-11-05 18:59:44 +00:00
Matt-Yorkley
ce61b5088e
Fix debounce on variant search dropdown
...
This wasn't applied correctly so there was zero debounce, leading to a big excess of pointless requests whilst typing in the variant search dropdown
2021-11-04 20:44:09 +00:00
Thierry Jet
5ebee9cd5f
Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml
2021-10-26 19:38:49 +02:00
Thierry Jet
47e9692226
Add a close button to datepicker. Close the popover when clicked. Not yet using translation
2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8
Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation
2021-10-26 14:33:02 +02:00
jibees
fa7c64841f
Merge pull request #8286 from mkllnk/permalink-check
...
Avoid superfluous permalink check on site load
2021-10-22 09:14:41 +02:00
Cillian O'Ruanaidh
2462d71ab5
When creating backoffice orders hide variants with no stock by default
...
But let people include out of stock variants by checking a checkbox if they want.
Note, we only apply the variants in stock scope if a distributor is
present. I think this is because this search method is also used when
setting up subscriptions so I don't think we want to change the
behaviour there.
Co-authored-by: Maikel Linke <maikel@email.org.au >
2021-10-08 13:13:32 +01:00
Nihal M. Kelanthodika
d85a109a21
Merge pull request #7973 from apricot12/HQ_address_in_business_details
2021-10-07 18:32:24 +05:30
Andy Brett
5da1c2f7bd
Merge pull request #8288 from mkllnk/pending-changes
...
Translate "Save Changes"
2021-10-06 08:06:48 -07:00
Matt-Yorkley
8393414bf5
Adapt admin enterprise form handling for both address and business_address
2021-10-06 15:06:56 +05:30
Maikel Linke
5b9d5a6bce
Avoid console error by catching potential fails
2021-10-06 15:51:43 +11:00
Maikel Linke
129c4c92fa
Catch JS error on OC page
...
Calling `when variant.id in enterprise_rules` raised an error when
enterprise_rules was null.
Fixing this then revealed a missing require statement in a controller.
2021-10-06 15:29:41 +11:00
