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
26,241 Commits 21 Branches 450 Tags
d65b1bb38681644f8f6a4f1ef83c1906b66f24dc
Commit Graph

303 Commits

Author SHA1 Message Date
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
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
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
Jean-Baptiste Bellet
2258af9cec Don't display "group by size" if value is actually null or empty 
+ add spec
 2023-01-06 14:39:39 +01:00
Jean-Baptiste Bellet
69faf590b0 Create a spy obj for order_cycle_form as required now by removeCoordinatorFee() 
Based on `spec/javascripts/unit/admin/order_cycles/controllers/order_cycle_exchanges_controller_spec.js.coffee`
 2022-12-07 09:37:31 +01:00
Jean-Baptiste Bellet
66a684920a allSaved() method from LineItems needs to be spy 2022-11-03 15:55:48 +01:00
saunmanoj888
490c5afc59 Mock bigDecimal methods in specs 2022-10-25 00:05:31 +05:30
saunmanoj888
ee8454bd2c Use js-big-decimal package for calculation 2022-10-21 21:30:00 +05:30
saunmanoj888
b40cd579bc Fix spec failure 2022-10-19 23:18:22 +05:30
saunmanoj888
8e45b758ba Fix unit value UI issue 2022-10-19 22:59:28 +05:30
Rachel Arnould
617a417dc2 Merge pull request #9506 from binarygit/remove-angular-from-payment-methods 
Remove angular from payment methods
 2022-10-11 13:13:26 +02:00
Manish Sharma
cd71233163 Fixed duplicates enterprises in order cycles 2022-10-10 14:30:58 +05:30
binarygit
01c477f2cb Remove angular from Payment Methods 2022-10-08 14:20:54 +02:00
Rachel Arnould
e98d4af630 Merge pull request #9659 from saunmanoj888/fix-bulk-product-update-unit-value 
Allow to change unit value for numbers with a comma separator on bulk product update
 2022-09-21 13:04:08 +02:00
saunmanoj888
498d003684 Add unit specs for the js changes for unit_value 2022-09-13 23:28:27 +05:30
binarygit
90f4b1328b Remove angular from shipping methods tab in enterprise/edit 2022-09-13 15:20:33 +05:45
Jean-Baptiste Bellet
d53b2b94b9 When creating new product via /admin/products/new use BigDecimal 
to avoid bad rounded multiplication

example here:
700*0.001 = 0.7000000000000001

+ update specs as well
 2022-09-07 09:17:46 +02:00
binarygit
8861b6d077 Replace permalinks angular ctrl with stimulus 2022-08-31 10:06:51 +05:45
binarygit
79ba223e12 Delete angular code for side_menu 2022-08-10 15:14:15 +05:45
Jean-Baptiste Bellet
b2a0310e6f Handle the case when errors is a string 2022-07-05 15:48:31 +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
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
GeorgeThoppil
706f6025e9 Add all variants for only one distributor 2022-04-04 19:59:42 -04:00
Jean-Baptiste Bellet
17989b2f90 Update tests as well around order cancellation on item deletion 
js specs are not that easy to code (needs to spy callback...). Use system spec instead.
 2022-03-25 11:52:08 +01: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
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
Jean-Baptiste Bellet
f6e64f3a3c Update the tests as well 2022-01-10 11:27:32 +01:00
Jean-Baptiste Bellet
515e2cfc51 Multiply by unit_value as sumOfUnitValues is now scaled 2022-01-07 10:32:47 +01:00
Jean-Baptiste Bellet
b746eacd11 Both sumUnitValues and sumMaxUnitValues should handle imperial units 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
d4435b5f10 Update variant_unit_manager_spec.js.coffee 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
9cf5645478 Add a spec to handle imperial units 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
7b2a9df326 Handle unitsVariant when calling formattedValueWithUnitName 
- unitsVariant was unread but is necessary to compute the unit_name thanks to `VariantUnitManager.getUnitName()`
 2022-01-07 10:32:46 +01:00
Jean-Baptiste Bellet
3922ffa6a9 Handle imperial units for VariantUnitManager 2022-01-07 10:32:45 +01:00
SuprajaR
f9a1b17709 asserted the confirmation msg in test 2022-01-04 00:10:38 +05:30
Guido Oliveira
db45d7f4eb Cancel empty orders on BOM page 2021-11-06 10:25:34 -03:00
Jean-Baptiste Bellet
ba09618374 Avoid rounded with float numbers errors with javascript 
0.7/0.001 = 699.9999999999999

Use Math.round() to avoid this.
 2021-09-14 10:45:31 +02:00
Matt-Yorkley
5fb782aeba Update $qProvider configuration 
The default logic for how rejected promises are handled has changed slightly. This reinstates the previous default behaviour.
 2021-08-10 16:22:47 +01:00
Jean-Baptiste Bellet
2116779527 Add order cycle coordinator to the list of enterprises with fees 
- Thus, coordinator can choose to add its own fee for a specific supplier
 2021-07-28 11:40:57 +02:00
Nihal Mohammed
edca260af4 Hide shipped orders from BOM and update specs 2021-06-24 18:26:39 +05:30
Andy Brett
ca7b1f047b Merge pull request #7780 from apricot12/new_payment_method_html_bug 
Fix HTML bug on new payment method page
 2021-06-23 08:58:45 -07: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
Nihal Mohammed
522a7384e7 Fix HTML bug on new payment method page and update providers_controller spec 2021-06-12 01:47:08 +05:30
Jean-Baptiste Bellet
db8f8a2675 Create internal methods with regexp test 
- Make it more easily readable and add unit tests
 2021-06-11 10:40:02 +02:00
Jean-Baptiste Bellet
178c0a441b Move unlocalize_currency filter to a PriceParser service 
- It's no longer a filter but more a service: it's therefore more logic.
 2021-06-11 10:01:19 +02:00
Jean-Baptiste Bellet
d3c2158121 Handle comma as decimal separator in the unit value field 
- Add comma as a decimal separator in the regexp
 - Do not use parseFloat but our `unlocalizeCurrencyFilter` which is more tolerant
 2021-06-08 09:51:30 +02:00