raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,988 Commits 17 Branches 453 Tags
6262dc3a2e7dbbe09bebc2b0b64d2ff0ffb6bbc8
Commit Graph

383 Commits

Author SHA1 Message Date
Filipe
01e915800e Merge pull request #9037 from jibees/9028-last-item-of-order-cancellation 
BOM: show custom modal on last item deletion of an order
 2022-04-15 18:47:51 +01: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
Matt-Yorkley
7753d9e1ea Use TomSelect and dependent-select controller in admin order customer details form and remove ancient jQuery which uses global functions and inline scripts 
🎉
 2022-04-05 18:56:51 +01:00
Nihal Mohammed
5f2f5456a0 Add code to sort order by supplier when Enterprise user chooses to 2022-03-28 18:12:39 +05:30
Jean-Baptiste Bellet
b9efda9f64 Add custom confirm modal into the BOM interface 2022-03-25 10:58:33 +01:00
Filipe
28ac9d980c Merge pull request #8849 from jibees/render-pdf-with-stylesheet 
Create a new method pdf_stylesheet_pack_tag that actually include CSS in PDF files
 2022-02-21 23:09:21 +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
a951fd2c06 Create a new method pdf_stylesheet_pack_tag that actually include CSS file 
If running in developpement (ie. `Webpacker.dev_server.running?`), use webpacker to actually render/serve the CSS files.

Source: https://stackoverflow.com/a/60541688
 2022-02-09 11:21:50 +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
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
f17226ffbe Merge pull request #8438 from cillian/show-out-of-stock-line-items 
If an order has out of stock line items display them and let admins remove them
 2022-01-24 12:18:19 +00:00
Deepak Chauhan
7adc1186c6 removed transaltion or between buttons from multiple views 2022-01-19 03:16:55 +05:30
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
Filipe
da703b2d95 Merge pull request #8615 from jibees/8559-enable-sort-orders-by-order-full-name 
Enable sorting orders by order full name
 2022-01-11 11:27:36 +00: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
Cillian O'Ruanaidh
e2b8108972 If an order has out of stock line items display them and let admins remove them 2022-01-07 13:15:44 +00:00
Matt-Yorkley
a11aebb2ca Update stylesheets loaded with wicked-pdf to use Webpack 
Luckily wicked-pdf already has a corresponding helper method.
 2021-12-27 17:45:06 +00:00
Jean-Baptiste Bellet
7a48ffdd38 Add order.full_name as new column 
+ add the linked sortable header via `bill_address_lastname`
 2021-12-16 09:26:49 +01: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 Mohammed
f5743b3b36 Update invoice templates to use business address when form filled in 2021-10-06 15:06:56 +05:30
Sinan Chaush
7dc8500aa9 ask checkbox is removed from two pages 2021-10-04 17:08:32 +02:00
Andy Brett
f28200164b Merge pull request #8154 from meronokbay/8098-custom-modal-order-deletion 
Replaced the default alert and confirm modals in the order page by custom modals
 2021-09-15 09:22:58 -07:00
Maikel
9affc6a945 Merge pull request #8108 from Matt-Yorkley/andand 
Remove `andand` gem
 2021-09-10 15:06:00 +10:00
Meron Ogbai
4806ba540f Add modals in orders page 2021-09-09 06:23:39 +03:00
Meron Ogbai
2de75ef7f4 Remove default rails confirm behavior 2021-09-09 06:22:55 +03:00
Matt-Yorkley
1d5077061e Remove andand 
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
 2021-09-08 14:28:31 +01:00
Matt-Yorkley
fbdc38b6c4 Merge pull request #8111 from jibees/4582-remove-units-on-quantity-column- 
Display variant quantity on the quantity column on the edit order page in backoffice
 2021-09-02 20:45:22 +02:00
Jean-Baptiste Bellet
5c05be22f5 As it is a quantity column, display variant quantity 
(this column was confused, and was understood like a simply quantity column not the item quantity separated according to its "state")

Update specs as well
 2021-08-27 15:15:14 +02:00
Jean-Baptiste Bellet
8fe0a82b75 Change ng-click to ng-change to capture ng-model updated value 
- Create a feature test for this feature
 2021-08-20 15:18:09 +02:00
Matt-Yorkley
83f6132b6a Fix shipping tax display in regular invoice template 2021-07-27 22:01:24 +01:00
Matt-Yorkley
886e03af2f Merge pull request #7805 from Matt-Yorkley/adjustments-admin 
[Adjustments] Admin adjustments
 2021-07-27 12:23:29 +02:00
Andy Brett
7d399b4c6d Remove duplicative line item for taxes 2021-07-12 09:16:28 -07:00
Matt-Yorkley
c60554a14a Update display of associated tax amounts 2021-07-09 21:49:35 +01:00
Pau Pérez Fabregat
b500486f6b Merge pull request #7211 from jibees/4207-add-query-params-in-url 
Orders list : save filters params
 2021-06-18 11:19:26 +02:00
Luis Ramos
4252bd0bb1 For some reason report helper is not available on this view now, so we call Spree::Money directly 2021-06-01 22:34:04 +01:00
Jean-Baptiste Bellet
385446807d Add a clear filters button 
- This button clear all stored filters and then update results
 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
303bf5420e Add select2WatchNgModel directive 
- Select2 components cannot handle ng-model correctly: they do not update if the ng-model change. Add a directive to watch the ng-model and update the component value
 2021-05-31 10:44:21 +02:00
Jean-Baptiste Bellet
58a96c6500 Add missing ] char to be consistant 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
4f50afc188 Change shipping_method_id storage: in the query 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
1674c6a252 Improve HTML to improve tests readability 
- Specify `for` attribute to `<label />` element
- Initialize component with its default value

So, it's linked to its `<input />`
 2021-05-31 10:44:12 +02:00
Jean-Baptiste Bellet
c5a2d183d8 Save filter params to sessionStorage for orders list 
- Use sessionStorage to save the filters params each time a filter is modified
 2021-05-31 10:44:12 +02:00
Luis Ramos
de000228cf Fix problem in erb template by explicitly setting format to js while calling it 2021-05-06 23:52:16 +01:00
Luis Ramos
2c05478b2f Adapt routes and helpers to make view spec green 2021-04-13 16:54:32 -07:00
Luis Ramos
049c2b59ca Adapt routes and helpers to make view spec green 2021-04-13 16:54:32 -07:00
Andy Brett
f2e238d0ea refactor view logic to helper 2021-04-03 13:33:09 -07:00
Andy Brett
9f0f88de4e allow any quantity if variant is set to on demand 2021-03-31 22:02:32 -07:00
Maikel Linke
0980b81742 Raise errors in specs with missing translations 
The previous mechanism didn't seem to work and newer Rails versions have
an easier config for this now.

Also fixing all i18n errors which were now failing specs.
 2021-03-30 17:08:17 +11:00
Andy Brett
d78517b6ed Update app/views/spree/admin/orders/_add_product.html.haml 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-03-26 09:34:12 -07:00
Andy Brett
563a2758a6 remove UI for modifying line items on canceled orders 2021-03-25 16:52:56 -07:00
Jean-Baptiste Bellet
d79c457dae Use native <a /> element to create a mailto link 
- Nothing special done by helper method `mail_to` so using a native <a /> element (and it's correctly escaped)
 2021-03-18 15:09:21 +01:00