raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,582 Commits 18 Branches 452 Tags
c4e58eab3cd2f8f4d00713b0ef2e3ddfc0d3f976
Commit Graph

4194 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
bfbcdba98c Modify configuration to match new version of webpacker 
Error was:
```
ERROR in chunk admin [entry]
js/[name]-[contenthash].js
Cannot use [chunkhash] or [contenthash] for chunk in 'js/[name]-[contenthash].js' (use [hash] instead)
```
 2023-03-20 11:34:57 +01:00
Maikel
512cb44df5 Merge pull request #10330 from mickenorlen/8909-add-balance-to-api-v1-customer-endpoint 
Add balance to api v1 customers endpoint
 2023-03-20 15:47:41 +11:00
Filipe
8bef0f9a43 Merge pull request #10337 from jibees/9419-send-invoices-per-email-in-bulk-from-the-admin-orders-page 
Admin, orders list page: send invoices per email in bulk
 2023-03-17 10:58:26 +00:00
Filipe
9ea6fa5c44 Merge pull request #9687 from dacook/9616-order-cycle-open-webhook 
Add webhook triggered on Order Cycle Open
 2023-03-16 17:24:22 +00:00
Konrad
a945f8f72f Merge pull request #10522 from mkllnk/flipper-upgrade 
Bump flipper* from 0.20.4 to 0.26.0
 2023-03-16 17:24:33 +01:00
David Cook
4757b82a80 Update all locales with the latest Transifex translations 2023-03-16 14:15:04 +11:00
Maikel Linke
f1a5c46685 Remove unnecessary Flipper memoizer config 
Auto-config, yay.
 2023-03-15 12:54:03 +11:00
Maikel Linke
00f2f92ce0 Remove unnecessary Flipper active_record config 
This is now done automatically when including flipper-active_record in
the Gemfile.
 2023-03-15 12:54:03 +11:00
Maikel Linke
62d0ce290a Update translations 2023-03-10 11:42:36 +11:00
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
Maikel Linke
a9c8d9f304 Configure host for dfc_provider engine globally 
Passing the parameter all the time was pretty inconvenient.
 2023-03-07 16:39:02 +11:00
David Cook
00a823b2fc 6. Add webhook endpoints to user developer settings screen 
Allowing creation and deleting via the user association.
It probably won't be much effort to allow editing and multiple records, but I cut it down to the minimum needed to avoid any further delays.

I couldn't find a way to test a failure in the destroy method, but decided to keep the condition because I thought it was worth having.
 2023-03-07 15:38:50 +11:00
David Cook
739df4be01 4. OrderCycleOpenedJob triggers webhook 2023-03-07 15:38:50 +11:00
Jean-Baptiste Bellet
2814b1f399 Update all locales with the latest Transifex translations 2023-03-03 09:35:40 +01:00
Jean-Baptiste Bellet
5e61aa8a77 Create the bulk send invoice action in order list 
using the same pattern than SendConfirmationEmail action

Co-Authored-By: David Cook <david@redcliffs.net>
 2023-02-27 14:30:59 +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
David Cook
06d370a8ac Update all locales with the latest Transifex translations 2023-02-23 13:00:36 +11:00
Filipe
604fd75cff Merge pull request #10247 from abdellani/sales_tax_totals_by_order 
sales tax totals by order report
 2023-02-22 20:03:45 +00: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
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
Maikel Linke
e2ea4d21f4 Update translations 2023-02-17 14:12:24 +11:00
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
b91bb8961f Merge pull request #10434 from openfoodfoundation/dependabot/bundler/sidekiq-7.0.4 
Upgrade sidekiq from 6.5.8 to 7.0.4 (incl new metrics tab)
 2023-02-16 18:18:17 +00: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
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
9a03023b6b Replace bill_address phone by Customer phone to improve readability 
TBS;
 2023-02-15 09:44:26 +01:00
David Cook
d3e0ff269f Remove unsupported config 
In Sidekiq v7, this field is not recognised and gets passed through to Redis, which also doesn't recognise it and crashes.

It was added to avoid filling up Redis on dev, but it's actually a Sidekiq pro option which needs to be defined on jobs, so I guess it never worked.
 2023-02-15 12:22:41 +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
Ana Nunes da Silva
696edac813 Remove qz gem dependency 2023-02-14 08:08:20 +00:00
Ana Nunes da Silva
f9817925aa Remove receipt printing translations 2023-02-14 08:08:20 +00:00
Ana Nunes da Silva
8dc50caaa8 Remove print ticket action 2023-02-14 08:08:20 +00:00
David Cook
4cf45dcfe1 Update translations 2023-02-09 13:54:29 +11:00
Gaetan Craig-Riou
722b04a211 Add missing collumns on new_products page 
It also includes specs for ProductComponent
 2023-02-08 12:04:05 +11: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
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
Jean-Baptiste Bellet
a463a39abc Update all locales with the latest Transifex translations 2023-02-02 16:11:57 +01:00
Filipe
095e520777 Merge pull request #10339 from mkllnk/ssl 
Remove unnecessary SSL code
 2023-02-01 13:06:26 +00:00
Filipe
678c60c9b6 Merge pull request #10175 from abdellani/tax_totals_with_rates_by_producer_report 
Tax Totals with Rates by Producer Report
 2023-01-30 13:56:48 +00:00
Maikel Linke
0fc108a8e6 Remove useless option to allow SSL 
It's an outdated Spree setting. We always enforce SSL in production and
staging while development and test environments are running without SSL.
This setting didn't have any effect.
 2023-01-30 14:19:37 +11:00
Maikel Linke
b35f9551eb Update translations 2023-01-27 17:12:37 +11:00
Maikel
4193cdb9f1 Merge pull request #10320 from dacook/remove-ie-warning 
Remove unnecessary IE warning
 2023-01-27 17:02:53 +11:00
David Cook
57678b7566 Remove IE warning 
It brings me great pleasure to remove this. I've been waiting my whole career: IE is finally gone!!
 2023-01-27 12:45:46 +11:00
Filipe
1cfc13e66f Merge pull request #10208 from jibees/9424-calculator-provide-a-calculator-none 
Admin: Include a "None" option for calculator type user in shipping method and payment method forms
 2023-01-26 14:48:41 +00:00
Filipe
d2d9e318fc Merge pull request #10310 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-5.0.0 
Bump sidekiq-scheduler from 4.0.3 to 5.0.0
 2023-01-25 12:42:16 +00:00
Filipe
a2a1d8b7e2 Merge pull request #10264 from dacook/readonly-mail-settings 
Update mail settings notice
 2023-01-25 12:25:05 +00:00
Maikel Linke
cec9d2987e Name order attributes similar to other text 
Rails' auto-generated names used in error messages were a bit cryptic
for users.
 2023-01-25 15:49:44 +11:00
Maikel Linke
ab7e1ac39f Display error messages to user for convencience 
It will also help us to debug the application if the error is not
obvious.
 2023-01-25 14:50:28 +11:00