raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,378 Commits 21 Branches 450 Tags
b2a0310e6f08ab64fdd7999d47e5582dace18521
Commit Graph

2986 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
b2a0310e6f Handle the case when errors is a string 2022-07-05 15:48:31 +02:00
Jean-Baptiste Bellet
7a1bd660c4 Prepare ofn-drop-down to have a "disabled" state and a "prepend" element 2022-06-28 17:39:41 +02:00
Jean-Baptiste Bellet
400a490ec5 Display fee name instead of fee type 
+ update specs as well
 2022-06-21 16:08:45 +02:00
Maikel
553046addb Merge pull request #9255 from jibees/fix-admin-taxonomies-interface 
Fix admin taxonomies interface
 2022-06-21 09:41:55 +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
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
0ed99c5ebd Merge pull request #9132 from jibees/8540-handle-items-in-bulk-order-management-page 
Handle `items` in bulk order management
 2022-06-10 10:08:14 +02:00
Jean-Baptiste Bellet
68bd1df312 Handle rename with context menu on the first taxon ie. the root one 
Also rename the main input field (sort of title) when updating the root taxon name with contextual menu
 2022-06-02 16:03:16 +02:00
Jean-Baptiste Bellet
4bbbae68c7 Do not send parent_id is it's something else than a number 
When moving element on top, `new_parent.attr("id")` was `taxonomy_tree` which was causing DB error
 2022-06-02 15:41:44 +02:00
Jean-Baptiste Bellet
121c9eed3b Replace Spree.url().clone() by new URL() 2022-06-02 15:41:44 +02:00
Arthur
05c8414e0d Merge branch 'openfoodfoundation:master' into remove-closed-associated-adjustments-button 2022-06-01 16:03:43 -03:00
Maikel
8645277a05 Merge pull request #9204 from AgriculturaFamiliar/8755-fix-search-input 
Select all text upon focus on map search input for Google Maps
 2022-05-31 10:57:02 +10:00
Jean-Baptiste Bellet
df1b126852 Initialize unit_value_with_description 
+ Specify to empty field since its now filled with default value `1.0`
 2022-05-30 14:54:47 +02:00
Jean-Baptiste Bellet
134202bedd Initialize value for variant_unit_with_scale 2022-05-30 14:54:47 +02:00
Arthur Vieira
95010fcd12 Remove the unlock condition in shipment controller 
This assumes unlock is always true so the shipment's fee adjustments
always opens and closes.
 2022-05-26 09:21:48 -03:00
Jean-Baptiste Bellet
2c29b1f60f Replace Angular directive and use stimulus controller 
+ Update specs as well
 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
Diego de Araújo Martinez Camarinha
8a62d95c48 Select all text upon focus on map search input for Google Maps 
On the map page, when we search a location and than want to search for
another, we would have to delete letter by letter of the previous search
text.

Now, when we click on the search input to type another search text, the
previous text will be all selected and we can remove everything with
just hitting the backspace once
 2022-05-20 11:06:34 -03: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
GeorgeThoppil
8903496a1b Optional restocking items 2022-05-06 10:55:24 -04:00
Jean-Baptiste Bellet
9c231a831d Replace Angular directive and use stimulus controller 
+ Update specs as well
 2022-05-05 14:53:32 +02:00
Jean-Baptiste Bellet
a68f9a71fb When items quantities, update sumUnitValues() and sumMaxUnitValues() 
by summing only `quantity` and `max_quantity`

+ update the specs as well

Co-Authored-By: Maikel <maikel@email.org.au>
 2022-04-27 11:21:47 +02:00
Jean-Baptiste Bellet
a4afeeaa3d When BOM is 'item', do not update sumOfUnitValues with scale 
since scale is always `1`, but return a value

+ update tests as well
 2022-04-25 15:53:38 +02:00
Jean-Baptiste Bellet
3553cc0d9f When it's items scale is '1' 
update tests as well
 2022-04-25 15:51:38 +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
Filipe
1f6b5ef309 Merge pull request #8979 from jibees/6300-dont-submit-form-element-that-are-not-handled-by-backend 
shipping fees on admin: avoid backend error when updating calculator type
 2022-04-20 12:23:32 +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
Jean-Baptiste Bellet
e607d5c161 Shipping method: disabled form element to not submit them 
As they're not handled by the backend
 2022-04-19 15:16:07 +02:00
Jean-Baptiste Bellet
a6c69c8530 Ensure that form element are well disabled to not submit them 
As they're not handled by the backend
 2022-04-19 14:28:18 +02:00
Filipe
4dde49c881 Merge pull request #8991 from jibees/8985-Make-checkbox-for-Send-a-cancellation-email-to-the-customer-checked-by-default 
Admin, editing order, on last item deletion modal: "Send a cancellation email to the customer" checked by default
 2022-04-18 14:04:08 +01:00
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
Nihal Mohammed
15e7a5a4df Rename product_stock_display to product_low_stock_display 
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
 2022-04-15 10:59:42 +10: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
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
Matt-Yorkley
09bd7126d8 Replace/remove a custom select2 Angular directive 2022-04-05 18:56:51 +01:00
GeorgeThoppil
706f6025e9 Add all variants for only one distributor 2022-04-04 19:59:42 -04:00
Jean-Baptiste Bellet
c9248f872d Remplace window.confirm by ofnCancelOrderAlert 
to prevent use that the order will be canceled
 2022-03-25 11:28:10 +01:00
Jean-Baptiste Bellet
a71e95da27 ofnCancelOrderAlert can accept i18n key to customize message 2022-03-25 11:10:54 +01:00
MrFuku
7c1a4d6791 Fix untranslated flash message 2022-03-22 17:53:57 +09:00
Filipe
87c79a5941 Merge pull request #8294 from guidoDutra/8131-cancel-empty-orders-on-BOM-page 
Cancel empty orders on BOM page
 2022-03-18 11:24:26 +00:00
Jean-Baptiste Bellet
ea3e15f0c8 Max|Current fulfilled value is the max|current divided by group_buy_unit_size 
+ improve testing with representative values
 + Update bulk_order_management_spec.rb and revert previously changed values
 2022-03-14 09:06:05 +01:00
Jean-Baptiste Bellet
08d4aea2b9 "Send a cancellation email to the customer" checked by default 2022-03-14 09:05:17 +01:00
jibees
04ed7e4a94 Merge pull request #8972 from jibees/8965-retrieve-scale-of-a-product-in-the-BOM-interface 
Improve the way we get the unit value (g, oz, lb, ...) in the Bulk Order Management interface
 2022-03-11 09:01:02 +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
Jean-Baptiste Bellet
915714246f Directly use the variant_unit_scale instead of VariantUnitManager.getScale 
and update the tests as well
 2022-03-08 14:59:08 +01:00
Jean-Baptiste Bellet
adcdca812d Delete that getScale method which is now useless 
since we now rely on the serialized variant_unit_scale
 2022-03-08 14:58:34 +01:00
Filipe
7590b3ecf8 Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute 
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
 2022-02-21 19:04:08 +00:00