13897 Commits

Author	SHA1	Message	Date
Filipe	fdc78b717e	Merge pull request #10123 from jibees/10017-introduce-a-filter-results-button-on-the-bom-page ... Introduce a filter results button on the BOM page	2022-12-28 16:55:30 +00:00
Rachel Arnould	95821098d8	Merge pull request #10154 from jibees/10146-split-checkout-design-changes-part-1 ... Split checkout design changes part 1	2022-12-28 16:36:57 +01:00
Rachel Arnould	27643945ed	Merge pull request #10200 from ijdershem/idersh/OFN-9834 ... [OFN-9834] Preserve 'Items' unit size selection on new product form e…	2022-12-28 16:05:43 +01:00
Jean-Baptiste Bellet	b0048cb453	Underline the text for title of the previously completed step	2022-12-28 15:27:37 +01:00
Jean-Baptiste Bellet	1e1ec95a5a	Include payment form right after the payment description ... which is right after the radio input that select the payment description	2022-12-28 15:24:46 +01:00
Jean-Baptiste Bellet	2d86e8857a	Put payment method description just above the ... + update spec by adding `data-paymentmethod-id` attribute	2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet	f1bb4fdf38	Same display css rules for price of payment and shipping method ... + update spec since parenthesis are added by css	2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet	a6856f3d21	Cancel button looked as disabled: now use a orange border and white bg	2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet	ca1a850d4a	Show shipping method description just bellow the radio input	2022-12-28 15:21:29 +01:00
Jean-Baptiste Bellet	93e736fdf6	Use label as a placeholder that move above the input when focused ... Couldn't make a pure CSS version because of the way rails generates its errors (it add `<span />` over the element, either `input` or `label`, itself)	2022-12-27 10:47:18 +01:00
Jean-Baptiste Bellet	988dcc6081	Use two columns for contact info and first/last name ... For small screen, it's a one column	2022-12-27 10:46:59 +01:00
Jean-Baptiste Bellet	d43f0331ac	Contact information section for email + phone number ... + add first name and last name to the billing address section	2022-12-27 10:46:38 +01:00
Jean-Baptiste Bellet	dcbe9dd1cb	Do not underline element that aren't link	2022-12-27 10:46:37 +01:00
ijdershem-jf	ef092dd53a	[OFN-9834] Fix red error highlighting on product unit value label ... [OFN-9834] Fix unit value form label association [OFN-9834] Update tests to reference correct product unit 'Value' field id	2022-12-24 18:36:41 -07:00
ijdershem-jf	5e0287d93f	[9834] Fix red error highlighting on product category select label	2022-12-24 18:13:23 -07:00
ijdershem-jf	58fb2ebe29	[9834] Fix red error highlighting on product unit selection label	2022-12-24 09:44:37 -07:00
ijdershem-jf	0d37614e90	[OFN-9834] Preserve 'Items' unit size selection on new product form error	2022-12-24 09:31:31 -07:00
Rachel Arnould	7a62a95e0b	Merge pull request #10103 from binarygit/stop-horizontal-scroll-of-body-in-order-summary-page ... [Split Checkout] Stop horizontal scroll on body in order summary page	2022-12-23 10:29:21 +01:00
Filipe	944d552f6b	Merge pull request #10156 from ijdershem/idersh/issue-9834-pt3 ... [OFN-9834-PT3] Add placeholder for new product supplier field	2022-12-22 15:42:38 +00:00
Filipe	c3e4c53a01	Merge pull request #10074 from binarygit/order-cycle-closes-during-split-co ... Redirect to shopfront when Order cycle closes during split checkout	2022-12-22 15:09:57 +00:00
Filipe	ae59621341	Merge pull request #10174 from ijdershem/idersh/OFN-9870 ... [OFN-9870] Correct error message for differing variant_unit_name for same product in import	2022-12-22 11:20:12 +00:00
Filipe	d61affd82b	Merge pull request #10093 from vviekk/viv/noneTranslate ... Translating text 'None' for tax and shipping categories of the product	2022-12-21 21:45:05 +00:00
ijdershem-jf	18e9aba6b8	[OFN-9870] Display accurate error message for differing variant_unit_name for same product in import	2022-12-20 08:19:47 -07:00
Filipe	561458ce43	Merge pull request #9933 from Laurel16/instagram ... Admin, Enterprise Settings, Social: Add instagram handler validator	2022-12-20 12:40:57 +00:00
Filipe	6f3d27b99b	Merge pull request #10089 from abdellani/fix-payment-non-3d-need-to-be-manually-captured-in-BO ... Fix Payments with non-3D cards need to be manually captured in the BO (Split checkout)	2022-12-20 10:09:45 +00:00
binarygit	3b179e75a4	Stop horizontal scroll on body in cart page	2022-12-19 21:30:31 +05:45
Filipe	006ad6be73	Merge pull request #9929 from abdellani/fix-available-shipping-payment-methods-dont-respect-oc-setting ... fix payment methods loading on multi-distributor order cycle checkout page	2022-12-15 17:05:03 +00:00
Filipe	d995e7630c	Merge pull request #10076 from abdellani/fix-available-shipping-methods-dont-respect-oc-setting ... Fix available shipping methods dont respect oc setting	2022-12-15 16:52:16 +00:00
ijdershem-jf	741dc0e29c	[9834-PT3] Add en translation for new product supplier select placeholder	2022-12-14 20:35:19 -07:00
Filipe	d801b6e970	Merge pull request #10102 from binarygit/enable-save-btn-after-removing-fee ... [Admin][Order Cycle] Enable save btn after removing fee	2022-12-14 17:13:32 +00:00
Rachel Arnould	fd95970774	Merge pull request #8996 from jibees/introduce-backoffice-ui-uplift ... Introduce backoffice UI uplift	2022-12-14 14:20:43 +01:00
Jean-Baptiste Bellet	a0056553b0	Do not override date range selection when an order cycle is selected ... Therefor user can change date range after selecting an order cycle	2022-12-14 10:14:54 +01:00
Jean-Baptiste Bellet	87ae8a40d1	Put date filter after the order cycle selector ... it's way easier to understand then that date range could change when selecting order cycle	2022-12-14 10:13:36 +01:00
Jean-Baptiste Bellet	ac494f97ec	When changing order cycle selection, update date range selector value ... Date selector should change when selecting an order cycle in order to reflect the order cycle date range itself	2022-12-14 10:12:42 +01:00
ijdershem-jf	ea45462e50	[9834-PT3] Add placeholder/default select option for new product supplier field	2022-12-13 18:17:49 -07:00
Rachel Arnould	f3d82b41ad	Merge pull request #10108 from binarygit/transparent-bg-in-ff ... Fix: Transparent background of 'Complete Order' area on Firefox mobile	2022-12-13 17:34:52 +01:00
Jean-Baptiste Bellet	311675f2cf	Used an already existing key ... Update bulk_management.html.haml	2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet	97c3aaebb2	Update the view as well: remove red clear button ... + remove all `refreshData()` callback on input change + align html (add fieldset, legend) to look same as `/admin/orders`	2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet	4716ed19dc	Remove the watch collection on date range: not needed anymore ... Yes! This simplifies a lot the code now since we have a "Search" button and we don't need to watch for date range changes	2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet	cd743e5c2c	Call resetSelectFilters on page load ... + init start and end date with a method (will be re-used)	2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet	a8278446b3	Simplify the way we render the name column	2022-12-12 15:20:30 +01:00
Jean-Baptiste Bellet	10bfe00123	Rename column "Name"	2022-12-12 15:20:30 +01:00
Mohamed ABDELLANI	9fbdb311b0	Update app/services/order_available_payment_methods.rb ... Co-authored-by: jibees <jb.bellet@gmail.com>	2022-12-10 11:51:35 +01:00
Laurel16	bfd396e644	Add instagram handler validator ... update entreprise model to match the correct pattern for instagram attribute & add migration to correct wrong links in db + test	2022-12-08 15:22:05 +01:00
Mohamed ABDELLANI	84aedaa1a1	run process_payments before order confirmation	2022-12-08 11:13:54 +01:00
Filipe	996d3afe4f	Merge pull request #9983 from cillian/remove-exchange-tags-n1-query ... Remove N+1 query loading tags for each order cycle exchange	2022-12-07 17:38:41 +00:00
Jean-Baptiste Bellet	500c4e8a2f	Already handled by app/webpacker/controllers/index.js ... Controller were instanced twice.	2022-12-07 15:38:20 +01:00
Jean-Baptiste Bellet	5002870b39	Add missing i18n translation for PaginationComponent	2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet	ec31d63c58	Do not import/initialize twice ... Already done in "controllers"	2022-12-07 15:08:54 +01:00
Jean-Baptiste Bellet	9dfc22451e	Selectors are close by default	2022-12-07 15:08:54 +01:00