raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,455 Commits 19 Branches 453 Tags
ae166ae2202b331e9f8ae46ecdccf69412f0693c
Commit Graph

14114 Commits

Author SHA1 Message Date
binarygit
ae166ae220 Fix: User does not get stuck when going backwards while creating new ent 2023-03-06 09:29:04 +01:00
binarygit
533f7048bf [Enterprise->Create] Show correct error message when user inputs url in instagram field 2023-03-06 09:29:04 +01:00
Konrad
0e13e5408f Merge pull request #10467 from abdellani/fix_hub_supplier_can_control_shipping_payment_method 
limit users who can update shipping/payment method of an order cycle
 2023-03-03 09:27:37 +01:00
Maikel
6371f7eff6 Merge pull request #10474 from abdellani/fix-customer-can-checkout-non-matching-shipping-and-product-categories 
Fix: Customers can checkout with non-matching shipping and product categories
 2023-03-03 11:27:11 +11:00
Filipe
60bea89f5c Merge pull request #10135 from abdellani/fix_when_user_deletes_a_shipping_method_existing_orders_are_updated_with_a_random_shipping_method 
Fix When user deletes a shipping method existing orders are updated with a random shipping method
 2023-03-02 20:03:59 +00:00
Mohamed ABDELLANI
348f806bbe remove load_shipping_methods 2023-03-01 10:53:03 +01:00
Mohamed ABDELLANI
89037e160c Update app/controllers/concerns/checkout_callbacks.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2023-03-01 10:51:27 +01:00
Mohamed ABDELLANI
eab8e2be6c load exclusively the shipping methods that support all the shipping categories of the line items 2023-03-01 10:51:27 +01:00
Maikel
182e5bd0ee Merge pull request #10493 from jibees/10492-background-reports-background_reports-breaks-pdf-and-xlsx-file-download 
Reports, `background_reports` feature toggle activated: Force writing file in binary mode
 2023-03-01 10:00:11 +11:00
Maikel
bccee0698f Merge pull request #10332 from jibees/8901-allow-product-description-to-show-images-in-the-shopfront 
Shopfront: Allow product description with formatting and `<img />`
 2023-03-01 09:56:41 +11:00
Konrad
11928859bc Merge pull request #10438 from jibees/10133-update-column-dropdown-everywhere 
Redesign old columns dropdown component to match the design of the new one
 2023-02-28 20:22:00 +01:00
Jean-Baptiste Bellet
075e295fc2 Force writing file in binary mode 
```
/Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:22:in `write': "\\xFE" from ASCII-8BIT to UTF-8 (Encoding::UndefinedConversionError)
from /Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:22:in `write'
from /Users/jibees/dev/openfoodnetwork/app/jobs/report_job.rb:8:in `perform'
```
 2023-02-28 15:30:14 +01:00
Mohamed ABDELLANI
066c7bb449 promote OrderManagement::Stock::Estimator.calculate_cost to a public method 2023-02-27 17:49:54 +01:00
Ana Nunes da Silva
d70c34fbd0 fix deprecation warning when accessing model errors 2023-02-26 21:04:16 +00:00
Filipe
3ffe39d467 Merge pull request #10448 from vviekk/viv/10009 
Fixing Enterprise creation submit button behavior
 2023-02-23 16:00:53 +00:00
Mohamed ABDELLANI
28f0d69540 Update app/services/order_cycle_form.rb 
Co-authored-by: David Cook <david@redcliffs.net>
 2023-02-23 07:22:49 +01:00
Mohamed ABDELLANI
a7e6760028 limit users who can update shipping/payment method of an order cycle 2023-02-23 07:09:49 +01: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
8b89c8d7e0 Merge pull request #10451 from cyrillefr/Sort-properly-date-chronologically-and-not-lexicographically 
Sort correctly in Bulk Order Managment
 2023-02-22 14:39:03 +01:00
cyrillefr
c015b2066f Sort correctly in Bulk Order Managment 
Converting date to utc + iso8601 format is
    sufficient to ensure proper sorting.
 2023-02-20 21:41:58 +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
Mohamed ABDELLANI
960dd81b76 remove customer id filter 2023-02-20 14:58:51 +01:00
Mohamed ABDELLANI
dda61d17ee delegate distributor && order_cycle to the order in the OrderFeesHandler 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
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
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
f6c9246e20 Merge pull request #10343 from jibees/9538-track-404-errors-in-bugsnag 
Notify bugsnag on 404 errors
 2023-02-16 17:45:41 +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
Jean-Baptiste Bellet
2eec3d625a Notify bugsnag on 404 errors 2023-02-16 13:45:42 +00: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
08fb496f55 Don't need to show any ship_address errors if no ship selected nor 
if the ship_address is the same than the billing one
 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
vviekk
2091eff671 Fixing Enterprise creation submit button behavior 2023-02-15 12:42:59 +05:30
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
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
Jean-Baptiste Bellet
d9eb97bd05 As we are in transition, angularjs dropdown component use both css classes 
And we should specify a bit the height of the component since it's used in different context
 2023-02-14 16:15:44 +01:00
Jean-Baptiste Bellet
28286a4c3e Slightly change classes and markup to make dropdown use the new style 
ie. `.ofn-drop-down-v2`
 2023-02-14 16:15:44 +01:00
Jean-Baptiste Bellet
6ec219031d Avoid to specifically use a label component for menu_item 
Then, add `label` CSS rule inside `menu_item` component
 2023-02-14 15:47:55 +01: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
Ana Nunes da Silva
cf519116ee Remove print ticket authorization 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
Gaetan Craig-Riou
1cf55cde4d Refactor column_value, to use a giant case 
A giant case is more readable that the previous 'smart' solution.
It also disables a couple of Rubocop checks triggered by the giant case
 2023-02-14 13:36:49 +11: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
Jean-Baptiste Bellet
32fc1eae61 Remove ship_address errors if shipping method isn't selected 2023-02-13 21:06:41 +01:00
jibees
d9d18b086c Merge pull request #10410 from mkllnk/api-customers-order 
Sort customers by id on API v1
 2023-02-13 10:41:13 +01:00