raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 20 Branches 451 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

325 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
45573dc522 Merge pull request #6753 from jibees/6746-epic-fullwdith-admin-layout-quick-wins 
FullWidth admin layout quick wins
 2021-01-28 21:10:06 +01:00
Pau Pérez Fabregat
0a1d4873e3 Merge pull request #6736 from jibees/6707-remove-anchor-jump 
Remove anchor in URL so avoid browser scrolling to the top of the page when editing order
 2021-01-28 21:09:08 +01:00
Pau Pérez Fabregat
2668747237 Merge pull request #6723 from luisramos0/spree_routes_2 
Move spree orders routes out of the spree engine routes into the main app routes
 2021-01-28 16:31:49 +01:00
Matt-Yorkley
f49355e5d3 Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments 
Delete dead code Spree::Order#price_adjustments
 2021-01-27 23:29:38 +01:00
Jean-Baptiste Bellet
a6fba8a065 Put content into grid columns system 
Two columns of three + a ten column rather than empty column + content outside column system

correct #6745
 2021-01-27 14:40:50 +01:00
Matt-Yorkley
d886b1dcea Tweak some styles and layout classes 2021-01-27 11:38:01 +00:00
Luis Ramos
d52661fe0a Fix admin order form to use admin orders route 2021-01-25 19:52:48 +00:00
Jean-Baptiste Bellet
686dcaaa1b remove '#' as path for link_to 
Adding '#' to the current url makes most of browser jump to the top of the page. Avoid this by deleting this added # (meaningless) and replacing it by empty string.
 2021-01-25 16:09:12 +01:00
Matt-Yorkley
0247386f82 Delete dead code Spree::Order#price_adjustments 
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
 2021-01-23 00:05:56 +00:00
Andy Brett
70f30f5224 Merge pull request #6658 from andrewpbrett/item-counter-fix 
Further fix #5989 (Item counter accepts values higher than the available stock)
 2021-01-21 10:56:18 -08:00
Andy Brett
ca37976661 Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component 
Create a reusable "loading spinner" component
 2021-01-20 19:21:31 -08:00
Andy Brett
8c4d12a501 limit item counter to max quantity available even if amount is manually filled in 2021-01-13 16:23:41 -08:00
Jean-Baptiste Bellet
8399b82bfd rename component to spinner 
A name for a "thing" rather a state
 2021-01-11 16:49:56 +01:00
Jean-Baptiste Bellet
e34050f7cb add wrapper to show/hide loading spinner 2021-01-11 16:23:22 +01:00
Jean-Baptiste Bellet
b02b36b8e8 replace code by reusable component 2021-01-11 11:18:34 +01:00
Andy Brett
c8c576ce38 keep size attribute 2021-01-09 17:49:47 -08:00
Bryan Mutai
eef6396de3 Add max attribute to item counter input 2021-01-09 17:36:35 -08:00
Matt-Yorkley
db3576f469 Merge pull request #6308 from luisramos0/translations 
Fix some missing translations in orders edit page
 2020-11-05 18:33:51 +01:00
Luis Ramos
0ae3bf985a Fix some missing translations in orders edit page 2020-11-04 21:54:27 +00:00
Tsara Sudrajat
f4c7a0b2a2 Align center order adjustment and order total title 2020-10-30 11:29:38 +07:00
Andy Brett
8585e6c7f0 add available units injection to BOM page 2020-10-29 09:18:19 -07:00
Luis Ramos
1b4e19b32d Remore preferences not used in OFN 2020-09-23 22:16:56 +01:00
Luis Ramos
ffac38d934 Remove option to enter state_name for countries without states 
Thisis not supported in OFN
 2020-09-01 16:06:49 +01:00
Luis Ramos
41d797489d Make onchange code simpler 2020-09-01 14:52:18 +01:00
Luis Ramos
46623242f7 Make use_billing checkbox work again, missign js code from spree 2020-09-01 14:28:45 +01:00
Luis Ramos
1a39a55009 Fix problem of converting from erb to haml 2020-09-01 14:09:06 +01:00
Luis Ramos
56fb09c006 Remove unused class 2020-09-01 14:03:20 +01:00
Luis Ramos
e4dee8a2fb Replace hash rockets 2020-09-01 13:57:57 +01:00
Luis Ramos
04f9c5ec5e Convert address form from erb to haml 2020-09-01 13:53:19 +01:00
Luis Ramos
8c322c1a0f Move shared address_form partial to the only place where it is used, order customer_details 2020-09-01 13:49:17 +01:00
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
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
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
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
Eduardo
d43e9b5716 add Actions dropdown to all pages of order details menu 2020-07-20 20:45:50 -03: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
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
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
983bed3c4e Merge branch 'master' into 3-0-stable-jun-2 2020-06-11 19:50:56 +01: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