raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,630 Commits 15 Branches 460 Tags
e6e4e014dc95da76a6d96cea21fa2fa45380cf21
Commit Graph

10524 Commits

Author SHA1 Message Date
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
Mohamed ABDELLANI
960dd81b76 remove customer id filter 2023-02-20 14:58:51 +01:00
Mohamed ABDELLANI
8ff197457e test accessing the Sales Tax Report By Order using different roles 2023-02-20 14:19:08 +01:00
Mohamed ABDELLANI
c43834915d sales_tax_totals_by_order report 2023-02-20 14:19:08 +01:00
Filipe
10d8e80c45 Merge pull request #10420 from anansilva/9311-remove-code-generating-receipts 
Remove code generating receipts
 2023-02-20 12:44:13 +00:00
Mohamed ABDELLANI
0738133e99 Update spec/system/admin/order_spec.rb 
Co-authored-by: Filipe <49817236+filipefurtad0@users.noreply.github.com>
 2023-02-20 09:55:29 +01:00
Mohamed ABDELLANI
15c241295e recreate the shipping rate that refers to the original shipping method if distributor no longer support it 2023-02-20 09:55:22 +01:00
vviekk
fc951e92ac Updating price, on_hand, on_demand validations for product import 2023-02-18 13:52:35 +05:30
Filipe
2f0e00370b Merge pull request #10385 from rioug/10350-BUU-read-only-product-list-take-2 
New product page, add missing column and handle formatting
 2023-02-16 18:41:05 +00:00
Filipe
ba46756cba Merge pull request #10445 from cyrillefr/Remov-I18nt-keys-from-automated-tests#9499 
Remov i18nt keys from automated tests#9499
 2023-02-16 17:51:08 +00: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
Rachel Arnould
1a7598d96d Merge pull request #10428 from jibees/9145-Splitcheckout,-add-error-message-when-no-shipping-methods-are-available-to-the-customer 
SplitCheckout: improve error messages in flash banner to improve user experience
 2023-02-16 15:33:12 +01:00
cyrillefr
ba30606052 Remove I18n keys from consumer specs 2023-02-16 14:33:17 +01:00
cyrillefr
f6f62515b5 Remove I18n keys in system admin specs 2023-02-16 14:33:09 +01:00
cyrillefr
a75892ccc1 Remove I18n keys in support specs 2023-02-16 14:28:14 +01:00
cyrillefr
0082653170 Remove I18n keys in service specs 2023-02-16 14:28:14 +01:00
cyrillefr
cc0b23c0bd Remove I18n keys in request specs 2023-02-16 14:28:14 +01:00
cyrillefr
b3ad5aeaca Remove I18n keys in model specs 2023-02-16 14:28:14 +01:00
cyrillefr
ffe9756f50 Removes I18n keys in mailer specs 2023-02-16 14:27:21 +01:00
Filipe
e3fa933699 Merge pull request #10381 from anansilva/8229-listing-orders-payment-state-cancelled-order 
Update payment (cash/EFF) state on cancelled order
 2023-02-15 12:06:38 +00: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
Jean-Baptiste Bellet
cf8d9c6d07 Improve spec when deleting all items of an order 
- Order1 has two line items
 - Check other Order2 does not change its state
 - Prepare context for the second spec: delete one line item of an order that does not trigger any order cancellation
 2023-02-15 11:38:04 +01:00
Mikael Norlén
3d06b75892 Simplify customers_with_balance spec 
Improve variable names and use multiple expectations
 2023-02-15 11:14:28 +01:00
Mikael Norlén
e95d08cae8 Add balance to api v1 customers endpoint 
- customers#show: Add balance (data_type: double) to customer attributes.
- customers#index: Add balance only if specified in extra_fields
query parameter: extra_fields[customer]=balance
 2023-02-15 11:14:27 +01:00
Mikael Norlén
22b1dd3232 Add support for extra_fields query parameter 
Api now supports optional fields.
These are included with the extra_fields query param.

Syntax: extra_fields[type]=field1,field2
 2023-02-15 11:14:27 +01:00
Mikael Norlén
96c0057b03 Use Customers as argument for CustomersWithBalance 
Change argument for CustomersWithBalance from
enterprise_id to Customers collection.

We have the need to calculate balance for customers in general,
not just for customers in a given enterprise.
 2023-02-15 11:14:27 +01:00
cyrillefr
78a6317c84 Remove I18n keys in reports lib specs 2023-02-15 11:08:19 +01:00
cyrillefr
fa57e37467 Remove I18n keys in User ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
7c24f6b26f Remove I18n keys from Pay/Stripe/Chkout Ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
f9f6abf740 Remove I18n keys from Api Ctrllers spec 2023-02-15 11:08:19 +01:00
cyrillefr
e6c0dd95c4 Remive I18n keys in Admin ctrller specs 2023-02-15 11:08:19 +01:00
Jean-Baptiste Bellet
0a3d362282 Still improve error message for Billing address 
```
"Bill" is a person's name, and I don't know his address
```

;)
 2023-02-15 10:07:59 +01:00
Jean-Baptiste Bellet
4cea7b1957 Improve error message, and use the same than the view 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
88607a3dce Improve bill address error message 
"(Street + House number)" instead of "address1"
and "postcode" instead of "zipcode"
 2023-02-15 09:52:24 +01:00
Jean-Baptiste Bellet
a39598d049 Reorder error messages to improve readability 
tbs;
 2023-02-15 09:52:10 +01:00
Jean-Baptiste Bellet
9a03023b6b Replace bill_address phone by Customer phone to improve readability 
TBS;
 2023-02-15 09:44:26 +01:00
Gaetan Craig-Riou
eb67340c52 Simplify usage of UnsavedChangesController 
Remove the need to manually bind handleSubmit to onSubmit event
 2023-02-15 10:51:23 +11:00
Gaetan Craig-Riou
75ed68c9cb UnsavedChangesController, automatically add onChange event handler to form elements 2023-02-15 10:30:52 +11:00
Maikel
255fc64fdb Merge pull request #10383 from filipefurtad0/add_pagination_BOM_spec 
Adds a spec on BOM pagination
 2023-02-15 09:38:43 +11:00
Ana Nunes da Silva
6de1fdc4ff Remove jquery-1.8.0.js 
Some js tests fail because they are dependant on jquery and we removed
jquery-1.8.0.js. Adding jquery2 to application_spec.js instead.
 2023-02-14 21:28:53 +00:00
filipefurtad0
c84ec148db Adds a spec on BOM pagination 
Adds coverage on bottom section of pagination

Extracts order line item creation to before block

Removes disabled option when asserting on button 2
 2023-02-14 12:04:38 +00:00
Ana Nunes da Silva
3e03988d93 Remove receipt printing settings 2023-02-14 08:08:20 +00:00
Ana Nunes da Silva
bb71b281d6 Remove print ticket links 2023-02-14 08:08:20 +00:00
Gaetan Craig-Riou
503e0ecba1 Fix category spec as per code review 
- Use a hardcoded string for the expected categories (taxons), and fix
taxon step up to not use default taxon
- Fix constant typo
 2023-02-14 13:36:12 +11:00
Maikel Linke
180434c5bd Avoid renaming params within report 
I changed the used parameter names within the report so that we don't
have to rename the given parameter names when the report runs. This
avoids modifying the `params` object and therefore other problems.
 2023-02-14 12:33:29 +11:00
Maikel Linke
7fe913713a Use same parameters for report job as for original 
The Enterprise Fee Summary report modified the `params` object. So when
we pass the same `params` a second time to the report class it doesn't
find the same values. In some cases that would lead to a server error.

The next commit implements a better solution though.
 2023-02-14 12:33:29 +11:00
Jean-Baptiste Bellet
32fc1eae61 Remove ship_address errors if shipping method isn't selected 2023-02-13 21:06:41 +01:00
Jean-Baptiste Bellet
51272eef00 Actually, those two tests are in the same context 
The diff is pretty hard to read, but i've put the two tests "removes it from the product list" and "keeps the line item on the order (admin)" under the same context and the same `before` block
 2023-02-13 13:38:57 +01:00
Maikel
3b6202313a Merge pull request #10422 from mkllnk/flaky-karma-specs 
Avoid side effects in Javascript specs leading to flakiness
 2023-02-13 12:37:06 +11:00
Maikel Linke
d05bb508de Avoid flaky spec by avoiding variable name conflict 
Specs were sharing the same variable and could influence each other.
 2023-02-13 12:23:45 +11:00