raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,884 Commits 18 Branches 452 Tags
7dc6cb151db0aed055dc2937eb3a48dd5d18655c
Commit Graph

14769 Commits

Author SHA1 Message Date
Filipe
b175793b91 Merge pull request #10704 from abdellani/hide-customers-with-no-completed-orders 
Hide users with no completed orders from a hub's customers list
 2023-06-30 10:56:56 +01:00
Filipe
d27a632a38 Merge pull request #11079 from abdellani/fix-distributors-listing-on-checkout-options 
filter distributors before listing on checkout options
 2023-06-29 17:02:34 +01:00
Filipe
36f4b2e7f9 Merge pull request #11107 from jibees/11085-edit-variant-cant-update-values-on-the-variant-edit-page 
Admin, Edit variant: remove unwanted extra space on price (added in certain specific conditions)
 2023-06-29 16:46:42 +01:00
Filipe
97f131e556 Merge pull request #11089 from jibees/11049-invoices-actions-dropdown-menu-disappears-after-creating-the-first-invoice 
[Invoices] Actions dropdown menu disappears after creating the first invoice
 2023-06-29 16:23:35 +01:00
Filipe
da226ea021 Merge pull request #11109 from mkllnk/image-urls 
Gracefully deal with missing S3 config
 2023-06-29 12:50:36 +01:00
Filipe
d92c7f89bd Merge pull request #11022 from Matt-Yorkley/matomo 
Call matomo manually on asynchronous page visits
 2023-06-29 12:02:48 +01:00
Jean-Baptiste Bellet
3286094804 number_to_currency can be nil: use a safe operator 2023-06-29 10:47:00 +02:00
Jean-Baptiste Bellet
2fcf706aa3 Remove unwanted space at the end of the price 
This `number_to_currency` method seems to display an extra space, not necessary when unit is `''`
Strip it.

Update specs as well. Thanks @filipefurtad0 for specs!!!
 2023-06-29 10:40:01 +02:00
Filipe
ba99f85f5c Merge pull request #10914 from abdellani/fix-stripe-sca-failure 
redirect user to payment when the card doesn't have enough credit
 2023-06-28 19:58:18 +01:00
Matt-Yorkley
ace2c5778f Call matomo manually on Turbo page visits 2023-06-28 12:52:54 +01:00
Matt-Yorkley
a0a1f8f910 Merge pull request #11002 from openfoodfoundation/voucher-prep 
Vouchers part 1
 2023-06-28 11:30:12 +01:00
Filipe
748cdaaa52 Merge pull request #10963 from jibees/10956-orders-page-uncaught-error-missing-target-element-tooltip-for-tooltip-controller 
Admin, Orders list: add tooltip on Edit action icon + capitalize tooltip (instead of uppercasing)
 2023-06-27 09:58:34 +01:00
Mohamed ABDELLANI
e678c6149f extract payment_faild from processing_failed 2023-06-27 09:26:26 +01:00
Mohamed ABDELLANI
4cca823a66 redirect user to payment when the card doesn't have enough credit 2023-06-27 09:14:48 +01:00
Maikel Linke
c3d49bf31a Speed up, simplify helper with ActiveRecord scopes 2023-06-26 12:56:00 +10:00
Maikel
014fb69d4b Merge pull request #10964 from macanudo527/fix_linelength_bundle1 
Fix Layout/LineLength - Bundle 1
 2023-06-26 12:10:39 +10:00
Maikel
a7915b8089 Merge pull request #10849 from mkllnk/report-cable 
Show "loading" screen for background reports and display when ready
 2023-06-26 10:25:48 +10:00
Maikel Linke
ff588cec40 Restore line item ordering 
The line item sorting by id has been replaced by sorting by completed_at
time: ccb183d60b

While that's a good idea, the query param to order was only defined in
the client Javascript and there was no default ordering. Line items also
get their completed_at date from the order. So it's the same for all
items of the same order and the ordering with that group of line items
was random.

Now we are adding an order in addition. Items are first sorted by date
and then by id if there's any ambiguity.
 2023-06-25 19:24:58 +02:00
David Cook
6240baec0d Update app/controllers/admin/enterprises_controller.rb 
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com>
 2023-06-23 16:18:45 +09:00
Maikel
e065910d2d Merge pull request #10939 from Matt-Yorkley/master-variants 
Remove master variants
 2023-06-23 13:42:58 +10:00
Maikel Linke
33d212d274 Gracefully deal with missing S3 config 
I could have split this into several commits:

* DRY direct linking to images.
* Check S3 config before direct linking.
* Just check if service is public instead of relying on name.

Developers may copy a staging or production database or experiment with
S3 storage. But when the S3 config is missing then calling `service`
raises an ArgumentError due to a missing name.

Now we only try to call `service` if the S3 config is present.
 2023-06-23 12:41:36 +10:00
David Cook
3bff7a9f13 Fix query 
With deep nesting syntax.

I chose the longer alias 'left_outer_joins' because it's more explicit, and matches the use up on line 121.
 2023-06-23 09:11:03 +09:00
Neal Chambers
1e4034534c Fix Layout/LineLength 2023-06-23 09:08:04 +09:00
Filipe
bca7813320 Merge pull request #10323 from abdellani/enterprise-fee-w-tax-by-order 
Enterprise fee w tax by order
 2023-06-22 23:25:11 +01:00
Filipe
9293dd379b Merge pull request #11087 from Matt-Yorkley/image-error-notifications 
Add image error Bugsnag notifications
 2023-06-22 16:30:57 +01:00
Jean-Baptiste Bellet
7ce3c3f447 Overide a text-transform: uppercase to capitalize 
Inherit comes from `app/webpacker/css/admin/components/buttons.scss`
 2023-06-22 14:15:43 +02:00
Jean-Baptiste Bellet
91d24ba8ab Add Edit tooptip for action icon in orders table 2023-06-22 14:15:43 +02:00
Mohamed ABDELLANI
b072da142e filter distributors before listing on checkout options 2023-06-22 09:00:39 +01:00
Jean-Baptiste Bellet
d2534d6645 Be more specific via !important than the default button rule 
This one should override the default one
 2023-06-21 15:01:14 +02:00
Jean-Baptiste Bellet
7d9018c590 Instead of overriding css rules, prefer to not select rules for trix buttons 2023-06-21 15:01:14 +02:00
Jean-Baptiste Bellet
5d1c32e8cd Remove linksDropdown which is now unused 2023-06-21 10:29:48 +02:00
Jean-Baptiste Bellet
ce28c14544 Replace AngularJS directive to a StimulusJS one 
Delete _order_links.html.haml_spec.rb
 2023-06-21 10:29:48 +02:00
Jean-Baptiste Bellet
7421691506 Creates a dropdown controller with its specs 2023-06-21 10:29:47 +02:00
Matt-Yorkley
776eac9f52 Add image error Bugsnag notifications 2023-06-20 14:14:19 +01:00
Matt-Yorkley
24aa55e053 Remove array syntax on new product form for product image 2023-06-20 13:14:52 +01:00
Maikel
101e72726c Merge pull request #11032 from dacook/show-current-version2 
Show current version2
 2023-06-19 10:07:49 +10:00
Mohamed ABDELLANI
27c1fd0d30 test invoice model 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
639567e903 replace attr with attr_reader 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
73cdcca022 fix linter issues 2023-06-18 21:03:13 +02:00
Matt-Yorkley
4eb05a1d73 Reduce public interface of OrderInvoiceComparator 2023-06-18 21:03:13 +02:00
Matt-Yorkley
3946e7a6f5 Memoize presenters in OrderInvoiceComparator 
This is now twice as fast and triggers half the number of database queries if both comparison methods get called
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
c6ec13443e Drop next_invoice_number method from Spree::Order 2023-06-18 21:03:13 +02:00
Matt-Yorkley
d3a31bd0bd Rename @invoice_presenter instance variable to @order in invoice templates 2023-06-18 21:03:13 +02:00
Matt-Yorkley
352ad20681 Fix display_checkout_taxes_hash in invoice_table4 template 2023-06-18 21:03:13 +02:00
Matt-Yorkley
68ab539ed3 Include completed_at attribute 2023-06-18 21:03:13 +02:00
Matt-Yorkley
113e1344f2 Include tax adjustments in serializer and presenter 2023-06-18 21:03:13 +02:00
Matt-Yorkley
5bbc63f716 Fix options_text displaying when there is no options_text 2023-06-18 21:03:13 +02:00
Matt-Yorkley
72e537b598 Update *_amount_with_adjustments methods on LineItem presenter 
These methods are slightly different and they're both needed in the template for invoice4
 2023-06-18 21:03:13 +02:00
Matt-Yorkley
208840b99d Use @invoice_presenter.checkout_adjustments 2023-06-18 21:03:13 +02:00
Matt-Yorkley
a44f24ad43 Remove prefixes from invoice data representation so it conforms to the same interface as order 2023-06-18 21:03:13 +02:00