Jean-Baptiste Bellet
149ec5511c
Translate select2 messages
2023-06-12 15:11:23 +02:00
Jean-Baptiste Bellet
ccb183d60b
Sort by order_date desc for line_items in BOM
...
+ update spec to have different order time
2023-06-05 10:05:09 +02:00
Filipe
12159edaca
Merge pull request #10833 from Matt-Yorkley/order-angular
...
Remove Angular from admin orders index page
2023-06-01 13:57:39 +01:00
David Cook
0df7c45a61
Change warning red to Mojo
...
Some templates still had this colour hardcoded. They are using angular so I didn't spend time updating them.
2023-05-26 15:11:23 +10:00
Matt-Yorkley
c3cf79f5ef
Delete angular ordersCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
134f1ab151
Replace angular bulkInvoiceCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
3df166fb2f
Drop jquery_ujs
2023-05-20 19:47:41 +01:00
saunmanoj888
aee7645e29
Fix searching issue with full name on bulk order management
2023-05-17 13:14:10 +02:00
Jean-Baptiste Bellet
51d6fb81dd
Fwd to request the restock_items input value when adjusting items qty
2023-05-11 22:58:44 +02:00
Jean-Baptiste Bellet
f679d8733e
Pass the restock_items params to each methods and request call
...
+ update spec to test whether the restock item checkbox is checked or not.
2023-05-11 22:58:44 +02:00
Gaetan Craig-Riou
d1f7cc1b2a
Merge pull request #10764 from Matt-Yorkley/remove-data-hooks
...
Remove `data-hook` attributes
2023-05-02 16:35:46 +10:00
Konrad
1176ea2a5f
Merge pull request #9941 from basilawwad/conditionally-send-cancellation-email
...
Conditionally send cancellation email when cancelling order.
2023-04-28 21:54:42 +02:00
Matt-Yorkley
b9431cd121
Remove data-hook attributes
2023-04-28 13:03:13 +01:00
basilawwad
fa373518fb
applied modal function
...
Update variant_autocomplete.js.erb
Applied modal function
refactored function
fix indentation and removed old function
2023-04-20 11:46:02 +02:00
Jean-Baptiste Bellet
2690ff5eb5
Add comment, which links these two files together
2023-04-20 08:45:03 +02:00
Konrad
2fa86492d1
Merge pull request #10653 from openfoodfoundation/10645-pagination-in-bom-not-aggregating-results-when-clicking-a-productvariant
...
BOM: When selecting a specific variant, trigger a new search that avoid pagination issues
2023-04-18 14:49:14 +02:00
Jean-Baptiste Bellet
11a7aa9f96
When clicking on "Clear Filters" button, to not reset variant selection
...
+ add some specs to cover that particular case
2023-04-17 11:08:17 +02:00
Jean-Baptiste Bellet
df5c21048a
Clear on bulk submenu should reset some filters + refresh data as well
2023-04-12 09:58:01 +02:00
Jean-Baptiste Bellet
8a124fb6be
BOM: once variant has been selected, refresh data with a new search
...
- Remove variant_filter
- instantiate a new search to avoid pagination issues
2023-04-12 09:58:00 +02:00
James Wu
546e90b286
Sort orders by last names
2023-04-11 15:25:20 +10:00
Filipe
d9e9add78b
Merge pull request #10527 from vviekk/10456
...
Fixing 'unsaved' alert behaviour for order cycle edit forms
2023-04-06 17:05:49 +01:00
Filipe
fc8d9252d5
Merge pull request #10605 from abdellani/fix-impossible-to-reach-OCs-older-than-6-months
...
Fix load order cycles by date ranges
2023-04-05 17:33:51 +01:00
Filipe
1673a18eb6
Merge pull request #9729 from binarygit/remove-angular-from-users
...
Admin, Enterprise Settings, Users tabs: remove tooltips directives + use reflex to invite user to be managers
2023-03-23 11:52:18 +00:00
Mohamed ABDELLANI
d3a25282de
fix load order cycles by date ranges
2023-03-23 12:02:17 +01:00
Jean-Baptiste Bellet
465a295dfa
Delete manager invitation controller
2023-03-23 11:21:05 +01:00
Filipe
6b30a654a6
Merge pull request #10516 from macanudo527/fix_taxonomy
...
Fix Sorting entries in a taxonomy is broken
2023-03-23 09:23:16 +00:00
Rachel Arnould
75c3bf8b56
Merge pull request #9630 from binarygit/remove-angular-from-business-details
...
Remove angular from business details
2023-03-21 18:31:40 +01:00
Jean-Baptiste Bellet
918e220557
Move $locationProvider configuration to another file
...
Actually the `config()` method of `admin_ofn` file did not run on `/admin/enterprises/*` pages for an unknown reason
Now those two files have the same configuration
2023-03-20 08:37:47 +01:00
Filipe
e8430eae6d
Merge pull request #10460 from jibees/10400-pagination-in-bom-not-aggregating-results-from-quick-search-field
...
BOM: Add a search input that search for items with pagination
2023-03-15 16:31:32 +00:00
vviekk
2674df026a
Fixing 'unsaved' alert behaviour for order cycle edit forms
2023-03-13 17:50:00 +05:30
Rachel Arnould
aba3968bca
Merge pull request #10447 from jibees/9148-no-bulk-delete-possible-on-bom-when-orders-have-multiple-items
...
Admin, BOM: can bulk delete line items of an order
2023-03-08 14:56:25 +01:00
binarygit
8f6fdf3e31
[Admin, Enterprise Settings] Remove Angular from Business Details tab
2023-03-08 10:26:05 +01:00
Jean-Baptiste Bellet
ac739108a2
Improve readability by generating search string for ransack
2023-03-06 11:31:36 +01:00
Neal Chambers
63ba3defec
Use Spree Taxon Controller instead of API Taxon Controller
2023-03-06 15:07:52 +09:00
Jean-Baptiste Bellet
8ad532c41a
Can search bill_address:phone, firstname, lastname and distributor:name
2023-03-01 14:54:46 +01:00
Jean-Baptiste Bellet
ebd5d706c2
Add search input
...
Actually this only search for `order_email` or `order_number` or `product_name` or `supplier_name`
+ Improve display by reduce each columns width
2023-03-01 14:40:12 +01:00
Jean-Baptiste Bellet
8658b1a743
Remove quick filter that search only on displayed line items
...
+ remove specs as well
2023-02-28 15:39:31 +01:00
Jean-Baptiste Bellet
c83dac58a3
Confirm line items deletion that doesn't trigger an order cancelation
2023-02-27 11:09:59 +01:00
Konrad
f7f49377b4
Merge pull request #10297 from cyrillefr/convert-admin-order-cancellation-workflow-to-stimulus-reflex
...
Convert admin order cancellation workflow to stimulus reflex
2023-02-20 21:38:33 +01:00
Konrad
11e9329b97
Merge pull request #10351 from rioug/9874-order-cycle-creation-fix-needless-warning-and-data-loss
...
Order cycle creation, fix needless warning and add warning to prevent data loss
2023-02-16 16:08:37 +01:00
Jean-Baptiste Bellet
e5ca8b0ee1
Delete selected line items even if does not lead to order cancellation
2023-02-15 11:49:53 +01:00
cyrillefr
1682f6788d
Delete unused code
...
Delete now unused code for Angular style bulk orders cancelling
- the Angular controller file
- the bulk_cancel method from controller
- the corresponding entry in route
2023-02-07 15:40:40 +01:00
Jean-Baptiste Bellet
bddd887dcd
Load orders only if current line_items are loaded
...
+ update spec as well
2023-02-03 12:25:47 +01:00
Jean-Baptiste Bellet
d00e75de70
We should load orders that are linked to line_items displayed
...
This should not be related to any pagination, search or whatever: actually we consolidate line_items with order additional info based on line_items.order.id.
2023-02-03 11:40:07 +01:00
Jean-Baptiste Bellet
06cbc120f5
Pagination is actually linked to line_items and not orders
...
We display line_items as rows in BOM
2023-02-03 11:37:51 +01:00
Gaetan Craig-Riou
de97c59632
Order cycle exchange form, only set red border on pickup_time field if empty
...
The red border is set by setting pickup_time as $dirty, it then blocks next button and add leave page warning when it is not necessary, this is a fix for it.
2023-02-01 09:43:28 +11:00
Filipe
ad4670705e
Merge pull request #10245 from jibees/10222-in-bom-dont-show-group-buy-info-if-equal-to-0
...
Admin, BOM: Don't display "group by size" if group by product value is actually null
2023-01-25 15:29:05 +00:00
Jean-Baptiste Bellet
1a874d6fcf
Introduce pagination for BOM page
2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
85a748af99
When selecting an OC, do not pre-fill date range with OC date range
...
+ update specs as well
2023-01-18 17:39:42 +01:00
Jean-Baptiste Bellet
121a4a08af
On filters reseting , set dates to undefined: range is not mandatory
...
+ send flatpickr event to reset the component
+ update specs as well
2023-01-18 17:39:09 +01:00