raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 18 Branches 451 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

1100 Commits

Author SHA1 Message Date
Arun Kumar Mohan
bb9ab57699 Remove resend button on the orders edit page 2020-08-29 20:47:28 -05:00
Maikel
819a445547 Merge pull request #5712 from mbudm/issue/5208 
Add payment details to invoice
 2020-08-28 09:46:49 +10:00
Pau Pérez Fabregat
2fa8cd54fd Merge pull request #5769 from Matt-Yorkley/customer-names 
Customer names in reports
 2020-08-27 15:39:47 +02:00
Maikel
7a0b036edd Merge pull request #5899 from andrewpbrett/dashboard-link 
Update dashboard link to point to enterprise shop
 2020-08-27 10:53:43 +10:00
Maikel
d81ed36eef Merge pull request #5892 from arku/fix/price-i18n 
Fix price translation in Bulk Order Management
 2020-08-27 10:31:38 +10:00
Maikel
cad79d74c8 Merge pull request #5696 from jeduardo824/enhancement/5210-action-buttons-on-all-tabs 
Enhancement/5210 - Add Actions dropdown menu to all pages of Order Details menu
 2020-08-25 15:39:50 +10:00
Steve Roberts
4243ff293f Update invoice2 to also use the shared payment partial 2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361 Modify payment_list partial to be shared 
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
 2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97 Add more details on payments to invoice. 2020-08-20 17:16:20 +01:00
Matt-Yorkley
5f8fc64b31 Move layout adjustment from view to CSS 2020-08-15 12:18:41 +01:00
Matt-Yorkley
0b91991919 Add explanatory user message for viewing customer names 2020-08-14 20:48:33 +01:00
Andy Brett
d46fad3a02 remove map reference 2020-08-12 12:33:15 -07:00
Andy Brett
c75a864ff2 link to the enterprise's shop instead of a full map 2020-08-12 12:21:07 -07:00
Arun Kumar Mohan
13bf7497a9 Fix price translation in Bulk Order Management 2020-08-10 18:26:09 -05:00
Eduardo
51f39ee89d move coffee directive to partial 2020-08-02 20:01:49 -03:00
Luis Ramos
df465cf45b Merge pull request #5698 from rmklaus12/5575-backofficepay-missing-translation 
Added translation key to locale/en.yml for backoffice admin payment
 2020-07-30 19:01:11 +01:00
Pau Pérez Fabregat
e9787552c8 Merge pull request #5713 from Matt-Yorkley/taxon-icons 
Remove taxon icons
 2020-07-29 18:43:06 +02:00
Eduardo
d43e9b5716 add Actions dropdown to all pages of order details menu 2020-07-20 20:45:50 -03:00
Robin Klaus
d43a3ac65e Added translation key to locale/en.yml for backoffice admin payment and added lazy loading 2020-07-20 13:07:41 +10:00
Luis Ramos
cc3361aaac Merge pull request #5659 from dmarcoux/issue-5555 
Filter orders on inclusive dates in admin/orders
 2020-07-09 20:40:45 +01:00
Dany Marcoux
3dfabdc117 Filter orders on inclusive dates in admin/orders 
Closes #5555

Co-authored-by: Luis Ramos <luisramos0@gmail.com>
 2020-07-05 20:12:16 +02:00
Matt-Yorkley
46c40bdf33 Fix default image display in admin order edit 2020-07-03 22:58:29 +02:00
Matt-Yorkley
d2db9b3a66 Merge pull request #5599 from luisramos0/submit_on_enteer 
Make Enter submit the form on both products and orders admin
 2020-07-03 11:14:57 +02:00
Luis Ramos
658c77f3f5 Merge pull request #5701 from Matt-Yorkley/noimage 
Noimage
 2020-07-02 20:17:04 +01:00
Matt-Yorkley
26c511d47e Remove taxon icons 
These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
 2020-07-02 11:25:17 +02:00
Pau Pérez Fabregat
28376b1056 Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address 
Do not print the bill addr. name when there's none
 2020-07-01 17:50:09 +02:00
Pau Perez
8c371fd0d1 Do not print bill addr. in invoice2 either 2020-07-01 11:27:57 +02:00
Pau Perez
23178763b0 Do not print the bill addr. name when there's none 
The error

```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```

happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.

This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
 2020-06-30 08:46:01 +02:00
Matt-Yorkley
b441ac2644 Update paths to "noimage" images 2020-06-29 20:07:08 +02:00
Cillian O'Ruanaidh
a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes. 2020-06-29 18:11:08 +01:00
Luis Ramos
93a2e57bc6 Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard 
Fix Payment Methods table to show proper provider name
 2020-06-25 20:32:04 +01:00
Pau Pérez Fabregat
db80992326 Merge branch 'master' into drop-blockenspiel 2020-06-19 12:12:10 +02:00
Matt-Yorkley
7cc47d652c Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile 
v3 image precompile
 2020-06-18 12:01:23 +02:00
Luis Ramos
d0bb625c19 Merge pull request #5593 from coopdevs/fix-report-order-link 
Fix link from report to order
 2020-06-17 19:55:40 +01:00
Matt-Yorkley
add38bf550 Use #image_path helper correctly 
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
 2020-06-16 18:25:13 +02:00
Luis Ramos
e6e4b6f95c Add keypress events to text input fields on orders search page 2020-06-13 12:15:49 +01:00
Luis Ramos
1740879261 Revert directive and just use ng-kkeypress 2020-06-13 12:07:45 +01:00
Luis Ramos
f08b837115 Make enter submit the search form in products list 2020-06-13 11:51:00 +01:00
Eduardo
5ed5ed2873 fix payment methods table to show proper provider name 2020-06-12 18:26:54 -03:00
Pau Perez
6a7df0b165 Fix link from report to order 2020-06-12 12:26:56 +02:00
Luis Ramos
983bed3c4e Merge branch 'master' into 3-0-stable-jun-2 2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat
bc8a10c6a0 Merge pull request #5541 from luisramos0/has_variants 
Delete dead code related to products without variants
 2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
01a9b33fc9 Merge pull request #5482 from rmklaus12/5094-new-order-translation 
created partial for order page title to resolve French translation of…
 2020-06-11 13:23:28 +02:00
Luis Ramos
ccf6cbb003 Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation 
Changed translation syntax to normal t() call and lazy lookup.
 2020-06-10 23:00:44 +01:00
Luis Ramos
13a4a3edbe Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight 
Fix admin config separator without highlight
 2020-06-10 23:00:30 +01:00
Luis Ramos
1e248c1848 Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method 
Enhancement/5277 be able to filter orders according to shipping method
 2020-06-10 20:50:06 +01:00
Luis Ramos
88896b7730 Merge branch 'master' into 3-0-stable-jun-2 2020-06-08 19:17:11 +01:00
Cillian O'Ruanaidh
406309c577 Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine. 
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
 2020-06-05 16:43:38 +01:00
Robin Klaus
d5d6fbc01d created partial for order page title to resolve French translation of new order 2020-06-05 11:27:51 +10:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00