MrFuku
7c1a4d6791
Fix untranslated flash message
2022-03-22 17:53:57 +09: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
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
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
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
Jean-Baptiste Bellet
4a3e0ea9b9
Use the right scope to retrieve products based on properties
2022-02-07 08:57:18 +01:00
Filipe
e403fc171d
Merge pull request #8808 from Matt-Yorkley/login-modal
...
Remove all Angular code from Login/Signup process
2022-02-03 19:36:44 +00: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
Matt-Yorkley
794e0e0326
Delete old login modal code
2022-01-29 14:49:23 +00:00
Matt-Yorkley
13a7fb79cf
Move more login handling out of Angular
2022-01-29 14:49:23 +00:00
Matt-Yorkley
50389a864a
Improve dynamic Angular Bootstrapping
2022-01-29 14:49:23 +00:00
Matt-Yorkley
0577b46f3f
Create simpler non-Angular login modal
2022-01-29 14:49:23 +00:00
Filipe
e63225d389
Merge pull request #8727 from Matt-Yorkley/js-matomo-login
...
Move Matomo event tracking for login modal into Authentication service
2022-01-28 20:02:46 +00:00
Filipe
49030049dd
Merge pull request #8732 from Matt-Yorkley/template-cull
...
Remove some Angular templates
2022-01-27 15:18:06 +00:00
Filipe
54083ea803
Merge pull request #8738 from jibees/add-locale-to-stripe-elements
...
Add locale to stripe elements options to display stripe error messages in globale interface chosen language
2022-01-26 19:01:37 +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
cea4714296
Merge pull request #8761 from Dmoment/8457-missng-translation-or-between-buttons
...
removed translation or between buttons
2022-01-26 10:04:41 +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
Deepak Chauhan
5a6f322fd7
Merge branch 'master' into 8457-missng-translation-or-between-buttons
2022-01-20 15:41:15 +05:30
Deepak Chauhan
45660b48bb
removed or from admin/show_more.html.haml and split_checkout/_guest.html.haml
2022-01-20 15:35:58 +05:30
Matt-Yorkley
21ed136e00
Enable opening login modal via broadcasted DOM Event
2022-01-19 13:14:10 +00:00
Deepak Chauhan
7adc1186c6
removed transaltion or between buttons from multiple views
2022-01-19 03:16:55 +05:30
Filipe
62f0de75ee
Merge pull request #8679 from Matt-Yorkley/drop-jquery-ujs
...
Drop jquery_ujs
2022-01-17 16:30:25 +00:00
Jean-Baptiste Bellet
c22f3ec1db
Add locale to stripe elements options to display messages in right language
...
List of supported language by stripe elements:
https://stripe.com/docs/js/appendix/supported_locales
2022-01-17 15:10:51 +01:00
Matt-Yorkley
31b4c06ea3
Update rendering and shipping_type_selector directive
2022-01-16 11:30:58 +00:00
Matt-Yorkley
a6ef7ca17f
Move shipping_type_selector template to views
2022-01-16 11:05:17 +00:00
Matt-Yorkley
f06ec94b30
Render shop_variant partial normally and remove shop_variant directive
2022-01-16 10:46:26 +00:00
Matt-Yorkley
3afd6c273a
Move shop_variant templates to views
2022-01-16 10:41:55 +00:00
Matt-Yorkley
26ac59fbba
Move Matomo event tracking for login modal into Autherntication service
2022-01-15 16:21:33 +00:00
Sebastian Castro
115dfe445b
loading-message: make them all look the same in admin
...
use font awesome spinner instead of an image
2022-01-11 21:55:07 +01:00
Sebastian Castro
4a436978a9
loading-popup: debounce display
2022-01-11 21:55:07 +01:00
Filipe
4978c95e75
Merge pull request #8467 from SarvarKh/validate-social-links
...
Fix the issue with 'at' in enterprise twitter and instagram
2022-01-11 12:53:11 +00: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
Matt-Yorkley
99b75c9a6a
Adjust usage of remote-method links on credit card deletion
2022-01-08 16:54:23 +00:00
Matt-Yorkley
40ed23688d
Remove jquery_ujs
2022-01-08 16:54:23 +00: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
