5353 Commits

Author	SHA1	Message	Date
jibees	35c18664fc	Merge pull request #9389 from jibees/9388-handle-plural-in-order-selection-component ... Handle plural (and 0) on orders selection component	2022-07-26 15:57:58 +02:00
jibees	9d470c7a18	Merge pull request #9416 from aintluks/fix-label-button-terms-of-service ... Fix button labels on terms of service	2022-07-21 17:38:28 +02:00
jibees	19ff6d011a	Merge pull request #9415 from saunmanoj888/fix-for-shipping-method-radio-button ... Fix text alignment for category radio button under shipping method	2022-07-21 17:02:29 +02:00
jibees	9b1dcdcc78	Merge pull request #9412 from binarygit/optimize-notes-and-tracking-workflow ... Optimize notes and tracking workflow	2022-07-21 17:02:03 +02:00
filipefurtad0	b20385db95	Moves matomo tag to upper position within head section	2022-07-20 09:38:37 +01:00
Maikel Linke	dd6c066f5a	DRY view with JS translation	2022-07-20 17:01:10 +10:00
Lucas da Costa	35030bfd02	Fix button labels on terms of service	2022-07-19 22:53:30 -03:00
filipefurtad0	0a03c0a0fb	Adds js window element to container code	2022-07-19 19:29:02 +01:00
binarygit	1165c997bc	Add styles on notes/tracking info when hoving over their delete buttons	2022-07-19 13:36:58 +05:45
binarygit	6b042e4a17	Display notes field in admin/orders/new only after an item has been added	2022-07-18 16:15:37 +05:45
binarygit	ae2c56b29d	Omit tracking info row from shipping email when empty	2022-07-18 14:55:36 +05:45
saunmanoj888	55feb7648d	Fix text alignment for category radio button under shipping method	2022-07-16 23:17:06 +05:30
binarygit	2f01351ad2	Enable users to delete only non-empty tracking info/notes	2022-07-15 11:34:37 +05:45
binarygit	b88c85555e	Add delete tracking feature	2022-07-09 14:39:20 +05:45
binarygit	dc31ebebb1	Add delete note feature	2022-07-09 13:23:38 +05:45
Filipe	2f550725e3	Merge pull request #9368 from jibees/9178-add-note-on-order ... Admin, Edit order: Can add note on order	2022-07-08 12:13:18 +01:00
Filipe	3834724d45	Merge pull request #9236 from AgriculturaFamiliar/add-map-whatsapp-link ... Show whatsapp link on contact modal on map	2022-07-08 12:10:18 +01:00
Filipe	decfbc9658	Merge pull request #9356 from jibees/9248-add-tags-to-a-producer-only-order-cycle ... Add tags to producer-only order cycle interface	2022-07-07 23:45:02 +01:00
Jean-Baptiste Bellet	06b1c9aa40	Handle plural (and 0) on orders selection component	2022-07-06 09:48:12 +02:00
Jean-Baptiste Bellet	89809aed5f	Add counter on note input	2022-07-05 10:09:20 +02:00
Jean-Baptiste Bellet	3f1099d968	Add edit note line on an order	2022-07-05 10:09:20 +02:00
Filipe	3d5d9d1191	Merge pull request #9353 from saunmanoj888/fix-password-prefilled-issue ... Disable auto fill option for password on /admin/users/[ID] page	2022-07-01 10:41:29 +01:00
Arthur Vieira	066879fe62	Add icons to whatsapp links ... Uses the font awesome 4 WhatsApp icon in .svg format (which is under the Open Font License) in the pages where an enterprise's WhatsApp number appears as an hyperlink.	2022-06-30 19:19:10 -03:00
Arthur	54ec4e5016	Update app/views/shopping_shared/tabs/_contact.html.haml ... Co-authored-by: Maikel <maikel@email.org.au>	2022-06-30 19:19:10 -03:00
Arthur Vieira	e483ef8ccd	Fix whatsapp phone tooltip in registration ... The tooltip on the contact step of the registration form now displays the proper text, which has been added in the source language file.	2022-06-30 19:19:10 -03:00
Arthur Vieira	0deb3cd782	Replace url generation with 'whatsapp_url' method ... As suggested by mkllnk's following comment: 1eda7d8a4c (r890656117)	2022-06-30 19:19:10 -03:00
Arthur Vieira	624485ff25	Add whatsapp link to contact tab view	2022-06-30 19:19:10 -03:00
Arthur Vieira	cace62a718	Add producer whatsapp link to producers list ... Adds WhatsApp number with wa.me link between phone number and e-mail address in the producers list profile.	2022-06-30 19:19:10 -03:00
Arthur Vieira	79e762a815	Add whatsapp number to registration form ... Creates a field on the contact step of the enterprise registration form to create an enterprise with a WhatsApp phone number, with corresponding i18n keys for the field's name and placeholder text.	2022-06-30 19:19:10 -03:00
Arthur Vieira	62ee3c2de1	Add admin view field for whatsapp number ... Creates a field and tooltip in /admin/enterprises/<enterprise>/edit#!/contact for updating the enterprise's WhatsApp phone number, with corresponding i18n keys for the name of the field, placeholder and tooltip text.	2022-06-30 19:19:10 -03:00
Filipe	899a796896	Merge pull request #9348 from jibees/9315-add-boolean-to-set-enterprise-phone-number-mandatory-or-not ... Add boolean to specify if enterprise number (ABN, GST, SIRET, ...) is mandatory or not to generate invoices	2022-06-29 19:07:55 +01:00
Jean-Baptiste Bellet	8ba59079b3	Reverse per_page and actions components left <-> right	2022-06-28 18:12:47 +02:00
Jean-Baptiste Bellet	8d66f33230	per_page control can now be set on the right of the page	2022-06-28 18:12:20 +02:00
Jean-Baptiste Bellet	77e384ab71	Replace button by a drop-down ... + update specs as well	2022-06-28 17:39:41 +02:00
Jean-Baptiste Bellet	6f303a5244	Add tags interface for a producer only order cycle ... Add tags for first (and unique) outgoing exchange for a simple OC Order Cycle can have tags	2022-06-28 15:05:11 +02:00
Jean-Baptiste Bellet	3a1fde40c5	Add a Spree config option: enterprise_number_required_on_invoices	2022-06-28 09:50:12 +02:00
saunmanoj888	8d5616b351	Disable auto fill option for password on /admin/users/[ID] page	2022-06-26 23:45:18 +05:30
Filipe	6b00319e4a	Merge pull request #9191 from jibees/9186-inverse-hide-columns-UX-by-a-columns-to-show ... Admin, Reports: Inverting logic from "Columns to hide" to "Columns to show"	2022-06-21 17:34:31 +01:00
François Turbelin	76ea7089d9	Implement suggestions	2022-06-21 10:08:12 +02:00
François Turbelin	39a6b5d20f	Add disabled_at logic on spree users	2022-06-21 10:08:12 +02:00
Maikel	d5bec7e538	Merge pull request #9269 from jibees/fix-@order-distributor-website-in-/order/ORDER_ID-page ... As a customer, on an order page, distributor website should link to the order that is actually showing	2022-06-21 09:39:46 +10:00
Filipe	ef0a346076	Merge pull request #9212 from jibees/9140-assign-a-customer-to-an-order-in-admin-section ... When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form	2022-06-13 14:57:31 +01:00
Filipe	8b7d474f4c	Merge pull request #9177 from jibees/9067-save-all-data-when-submitting-the-form ... Admin, Create a new product: re-fill the form with fields values if any validation errors occurs when submitting	2022-06-13 14:54:02 +01:00
Jean-Baptiste Bellet	bf40e59bec	Should link to order.distributor website ... - order: the order summary the customer is seeing on this page - current_order: the order is the customer is check-outing + add specs	2022-06-13 14:52:20 +02:00
Jean-Baptiste Bellet	16babf8250	Don't modify params object, but use an intermediate variable ... `@params_fields_to_show`	2022-06-13 14:39:12 +02:00
Jean-Baptiste Bellet	214a470896	Remove the report Subtype selector in the Rendering Options section ... + add all sub-reports in the index page all of this is behind a feature toggle	2022-06-13 14:39:12 +02:00
Filipe	9fee4f1554	Merge pull request #9203 from AgriculturaFamiliar/remove-closed-associated-adjustments-button ... Remove closed associated adjustments button	2022-06-10 10:10:50 +01:00
jibees	e1fc4accab	Merge pull request #9288 from mkllnk/9279-image-order-display ... Show order and admin page despite broken image	2022-06-10 10:01:27 +02:00
Rachel Arnould	834bf04185	Merge pull request #9286 from jibees/9281-invoice-print-failed-when-enterprise-having-a-logo ... Admin, print an invoice with alternative mode: fix an issue when enterprise has a logo	2022-06-10 10:00:40 +02:00
Maikel Linke	bec2a873de	Show order and admin page despite broken image ... Avoiding: ActiveStorage::InvariableError Affects the admin order page and the customer's order confirmation page.	2022-06-10 15:35:21 +10:00