raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,308 Commits 20 Branches 451 Tags
6a22650feee7afdff3dbfc018254d91efc14f26a
Commit Graph

153 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
8fec5f1464 Use mixins useRenderCustomer 2022-05-31 09:00:24 +02:00
Jean-Baptiste Bellet
39b7f56e6d Use mixins useSearchCustomer 
Prefer composition vs. inheritance
 2022-05-31 08:57:11 +02:00
Jean-Baptiste Bellet
760de3b507 Do not set null value to select controller 2022-05-24 12:35:23 +02:00
Jean-Baptiste Bellet
5e27795a15 Special method to handle customer with no bill_address 2022-05-24 12:30:11 +02:00
Jean-Baptiste Bellet
ce058c6e36 Create a SelectCustomer controller 
To be used in `/admin/orders/ORDER_ID/customer` page

 - Fetch `/admin/search/customers.json?` with query as params
 - Render each items response thanks to `renderOption()` method
 - `onItemSelect()` is here to fill the associated form in the page
 2022-05-24 12:30:00 +02:00
Jean-Baptiste Bellet
5018f824f5 Prepare tom-select controller to inherit others controllers 2022-05-24 12:30:00 +02:00
Jean-Baptiste Bellet
68cb8d9965 Formatting file 2022-05-24 12:30:00 +02:00
jibees
641df45fcd Revert "When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form" 2022-05-24 09:50:18 +02:00
Rachel Arnould
5dfc3c7a62 Merge pull request #9151 from jibees/9140-fill-all-the-input-when-selecting-a-customer 
When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form
 2022-05-18 17:41:59 +02:00
Sebastian Castro
3b01c44eae Reports: Improve Exports 
Improve PDF style and encoding
Include header_row and summary_row, except for CSV and JSON
Style spreadsheets
Use only Xlsx no more Ods format
 2022-05-12 16:54:14 +02:00
Sebastian Castro
9874c7996e Reports: Adds Print Button 2022-05-12 16:54:14 +02:00
Sebastian Castro
287e8f5845 Reports Refactor 3 
Easily group and create header and summary row
Auto format cells when appropriate type (boolean, dates) and render_format (neither csv nor json)
 2022-05-12 16:54:13 +02:00
Sebastian Castro
209b56ffd7 Packing Report: Better print 2022-05-12 16:54:12 +02:00
Sebastian Castro
cbb6bd63d4 Print: load css, hide navbar 2022-05-12 16:54:12 +02:00
Sebastian Castro
1ff98a1d8a Reports: Improve UI 2022-05-12 16:54:12 +02:00
Filipe
24acf21c6d Merge pull request #9139 from jibees/6139-handle-shipping-method-description-with-no-space 
Split Checkout: Handle shipping/payment method description with no space
 2022-05-05 11:21:13 +01:00
Jean-Baptiste Bellet
c98d669b92 Create a SelectCustomer controller 
To be used in `/admin/orders/ORDER_ID/customer` page

 - Fetch `/admin/search/customers.json?` with query as params
 - Render each items response thanks to `renderOption()` method
 - `onItemSelect()` is here to fill the associated form in the page
 2022-05-02 13:36:49 +02:00
Jean-Baptiste Bellet
11b224f805 Prepare tom-select controller to inherit others controllers 2022-05-02 13:33:57 +02:00
Jean-Baptiste Bellet
d7df714280 Formatting file 2022-04-29 10:36:53 +02:00
Jean-Baptiste Bellet
89aa76dbbc Handle long payment description with no space 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
4635e67707 Create mixins to force wrap 
No need to pre-wrap since we break-word
 2022-04-29 10:15:50 +02:00
Jean-Baptiste Bellet
99c0416cc7 Handle long shipping method description with no spaces 2022-04-28 10:40:28 +02:00
Jean-Baptiste Bellet
5fe8060ea6 Actually don't use requestSubmit() as it is not supported by Safari 
https://caniuse.com/?search=requestSubmit
 2022-04-27 15:43:05 +02:00
Jean-Baptiste Bellet
a8afe7fee3 Use requestSubmit() method for actually submit the form with event 
... that could be catch by turbo (and then handled by cable_ready)

`this.catchFormSubmit` avoid infinite loop then
 2022-04-27 15:43:05 +02:00
Filipe
4ea1dd68af Merge pull request #9023 from apricot12/8908-Access-Enterprise-perms-from-setting-page 
Enterprise can access permissions from enterprise edit page
 2022-04-21 13:21:27 +01:00
Cillian O'Ruanaidh
4162830bee Switch help modals from angular templates to use ViewComponent and StimulusJs 2022-04-20 09:36:30 +10:00
Filipe
4009f3313f Merge pull request #8814 from Matt-Yorkley/tom-select 
Introduce new select/dropdown library
 2022-04-15 18:08:08 +01:00
Jean-Baptiste Bellet
1c68293cac Display remaining stock for variant in the shopfront 
Display only if all conditions are met:
 - Variant is not a bulk buy
 - Shop preference is true for `preferred_product_stock_display`
 - Only 3 (or less) items are remaining in stock
 - No item for this variant is already to cart
 2022-04-15 10:53:28 +10:00
Nihal Mohammed
d23846bfa2 Add Enterprise Settings to admin enterprises edit side menu, adds redirect_function to side menu services. 2022-04-13 17:03:04 +05:30
Maikel
e6c65f524a Merge pull request #9033 from seballot/select2-multiple 
select2: improve style
 2022-04-13 09:37:13 +10:00
Matt-Yorkley
7181694401 Include the little search icon for dropdowns with a search box 2022-04-05 18:56:52 +01:00
Matt-Yorkley
be9156d40f Refactor dependant-selector further and (conditionally) update TomSelect if present 
I'm also introducing a convention here of adding a `private` comment to visually demarcate which methods are meant to be part of the public interface of the class and which aren't. The methods aren't *actually* private in any technical sense, it's just a bit of syntactic sugar to allow the intention to be communicated more clearly in the code's structure.
 2022-04-05 18:56:51 +01:00
Matt-Yorkley
09bd7126d8 Replace/remove a custom select2 Angular directive 2022-04-05 18:56:51 +01:00
Matt-Yorkley
9bce2ca64c Allow initializing with custom TomSelect configurations 2022-04-05 18:56:51 +01:00
Matt-Yorkley
fedfeb6dd3 Add dropdown "primary" style with blue instead of white 2022-04-05 18:56:51 +01:00
Matt-Yorkley
5e3e8c32c3 Create a simple Stimulus controller and add basic styling 2022-04-05 18:56:51 +01:00
Filipe
f29dc3f978 Merge pull request #9009 from jibees/9007-already-opened-cart 
SplitCheckout: add already opened cart message on summary step when distributor allow order changes
 2022-04-01 13:29:34 +01:00
Filipe
be1c255067 Merge pull request #8892 from Matt-Yorkley/spree-login-routes 
Fix issue with unconfirmed email messages
 2022-03-28 13:38:17 +01:00
Sebastian Castro
66cdd56428 select2-light: make it looks like normal select 2022-03-24 10:44:18 +00:00
Sebastian Castro
9e55a306ee select2-multiple: improve style 2022-03-22 16:32:29 +00:00
Filipe
53544ee66a Merge pull request #8805 from cillian/remove-inline-advanced-settings-toggle-js 
Replace inline JS for toggling order cycle advanced settings with StimulusJs controller
 2022-03-17 16:05:46 +00:00
Jean-Baptiste Bellet
6f6ad05ac2 Factorize some css rules for panel 2022-03-17 16:47:16 +01:00
Jean-Baptiste Bellet
ac361d3b64 Add already_opened on each step 2022-03-17 16:47:16 +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
Matt-Yorkley
3effff8821 Show resent confirmation message in current tab 2022-02-18 09:42:49 +00:00
Jean-Baptiste Bellet
d858d6f941 Improve design by aligning cell on right but with padding 2022-02-11 11:09:54 +01: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
Cillian O'Ruanaidh
b43a68d717 Merge branch 'master' into remove-inline-advanced-settings-toggle-js 2022-02-04 12:24:17 +00:00
Cillian O'Ruanaidh
05756616dd Add a remote-toggle controller that can toggle elements outside of its scope 
This is instead of adding the :data-controller attribute to the div#wrapper because that will wrap pretty much all content on the admin pages.

Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2022-02-04 12:23:24 +00:00
Cillian O'Ruanaidh
d03b52a163 Revert "Replace inline JS for toggling order cycle advanced settings with StimulusJs controller" 
This reverts commit 67ae2e72f3.
 2022-02-04 11:47:38 +00:00