raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-23 01:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,518 Commits 16 Branches 454 Tags
b7de80dd7f5a0d85bc8d6033af6c19d083e4e901
Commit Graph

1041 Commits

Author SHA1 Message Date
Rob Harrington
d1d9c5a092 Add help button to saved cards list on account page 
Describes the purpose of the default card
 2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008 Use help-modal to display help text for authorised shops 
Also updated the text slightly to make it more clear when the purpose of authorised shops are
 2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde Add basic view allowing customers to authorise shop use of their credit cards 2018-06-22 15:39:47 +10:00
Frank West
8324b00999 Renames product bulk edit action to index 
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.

It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
 2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
b1bccb07f2 Merge pull request #2369 from coopdevs/product-import-for-superadmins-only 
Show product import's UI only to superadmins
 2018-06-19 09:23:58 +02:00
Maikel Linke
b7770510a7 Use CSS for layout 2018-06-18 11:08:58 +10:00
Maikel Linke
67c2574b0b Show report search instructions 
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
 2018-06-18 11:08:58 +10:00
Maikel Linke
6243640bca Unify sales tax report rendering with others 2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6 Unify report table rendering 
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
 2018-06-18 11:08:58 +10:00
Rob Harrington
d0f8e9fba6 Reimplement import date filter as an actual Filter 2018-06-15 11:31:47 +10:00
Pau Perez
78e59d059a Show product import's UI only to superadmins 
We still need to iterate on its implementation and it's too early to
make it publicly available.
 2018-06-11 19:50:53 +02:00
Rob Harrington
5cbc4cbf30 Use scoped keys for table headers in saved card partial 2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c Ensure that savedCreditCards always exists 2018-06-08 15:30:08 +10:00
Rob Harrington
e88e963b4c Alter cards interface to allow updating of default card 2018-06-08 15:30:07 +10:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867 PI timestamps 2018-05-26 19:34:19 +01:00
Pau Perez
2a3772dba0 Do not show icons for producer-enterprises 
Payment and shipping methods don't apply to them.
 2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd Ensure non-distributors are listed in dashboard 
We want to show all enterprises in a single list regardless of their
type.
 2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace Inline partials into enterprises view 
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
 2018-05-22 10:21:35 +02:00
Pau Perez
51f3542a92 Remove no longer used Angular controller 
There are no tabs to keep track of now.
 2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88 Remove enterprises producers tab from dashboard 2018-05-22 10:21:35 +02:00
Hugo Daniel
ef2b0b8383 Added tooltips and locale 2018-03-27 15:21:12 +11:00
duende13
f75b865be8 Made changes requested by reviewer, in labels and tests. 2018-03-27 15:21:11 +11:00
duende13
61300a62c2 Added 'meta_keywords' to search of products in shop page. Changed labels 
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
 2018-03-27 15:21:11 +11:00
Pau Pérez Fabregat
17b129ff4f Merge pull request #2079 from mjal/424cart-page-shouldnt-show-admin-handling-if-it-is-zero 
Cart page shouldnt show admin handling if it is zero
 2018-03-23 18:01:09 +01:00
Pau Pérez Fabregat
6ce552727b Merge pull request #2118 from oeoeaio/payment-summary-for-emails 
Show payment summary in confirmation email regardless of payment method
 2018-03-23 15:30:44 +01:00
Pau Pérez Fabregat
dadc02fb11 Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails 
Uk/1663variant order emails
 2018-03-23 15:29:05 +01:00
Duende13
330e7d71af Sort line items by name and unit_value for confirmation email and summary screen 2018-03-23 17:37:50 +11:00
Rob Harrington
4d757dde78 Show payment summary in confirmation email regardless of payment method 2018-03-16 10:55:56 +11:00
Matt-Yorkley
8a11dc3c33 Decouple image upload from Spree 2018-02-14 13:46:05 +00:00
Matt-Yorkley
7d27d1325e Bulk Edit image upload 
Image Upload Translations

Squashme

Squashme

Squashme

Code review tweaks
 2018-02-14 13:46:05 +00:00
Matt-Yorkley
24dca5e51f Add image column to product bulk edit 2018-02-14 13:46:05 +00:00
jtruong2
6c92fdf167 fixes issue if admin and handling == 0 then do not render row 2018-02-12 15:53:19 +01:00
Rob Harrington
501fa4c901 Replace references to 'standing order' with 'subscription' (erb) 2018-02-09 14:44:14 +11:00
Rob Harrington
672f96b85b Replace references to 'standing order' with 'subscription' 2018-02-09 14:44:13 +11:00
Rob Harrington
6e83c6dc86 Move standing order emails to a dedicated StandingOrderMailer 2018-02-09 14:44:07 +11:00
Rob Harrington
b89ab2c407 Adding link to view/edit the order from Standing Order placement and confirmation emails 2018-02-09 14:44:02 +11:00
Rob Harrington
7d1fc8cbe1 Make sure correct intro message is used for empty standing order notification 2018-02-09 14:44:02 +11:00
Rob Harrington
f969caa2d1 Do not place standing order when no items are available 
Send notification to customer informing them that an order was not placed...
 2018-02-09 14:44:02 +11:00
Rob Harrington
25639a822a Implementing standing order feature toggle on back-end interface 2018-02-09 14:43:57 +11:00
Rob Harrington
439c81d836 Format of hours in standing order placement email without leading zero 2018-02-09 14:43:56 +11:00
Rob Harrington
1e0d43e975 Changing explain text on confirm email 
Removing mention of making changes
 2018-02-09 14:43:56 +11:00
Rob Harrington
994baf12c4 Adding specs to ensure placement emails are sent 2018-02-09 14:43:56 +11:00
Rob Harrington
deebc31c34 DRYing out standing order email template 2018-02-09 14:43:53 +11:00
Rob Harrington
0f2adaa8d2 Adding link to standing orders index to orders sub-menu 2018-02-09 14:43:43 +11:00
Rob Harrington
f14c36ed6b Sending placement email when standing order order in placed on OC open 2018-02-09 14:43:42 +11:00
Rob Harrington
88563431b8 Module arguments passed to injection functions in consistent way 2018-02-09 14:43:36 +11:00
Matt-Yorkley
73d38cb91b Re-add text version of confirmation email for accessibility 2018-02-07 10:41:53 +11:00
Matt-Yorkley
ba98c7e2c5 Rewrite enterprise contact functionality 2018-02-07 10:41:52 +11:00
Matt-Yorkley
22eae753fe Remove enterprise confirmations 2018-02-07 10:41:52 +11:00