raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 17 Branches 453 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

2604 Commits

Author SHA1 Message Date
Enrico Stano
341604be8a Merge pull request #2094 from openfoodfoundation/transifex 
Transifex
 2018-03-13 08:39:11 +01:00
Maikel Linke
3743cf1bc3 Use I18nConfig for application defaults 2018-03-09 17:45:03 +11:00
Rob Harrington
b98afc00ba Show message about resumable orders when unpausing a subscription 2018-03-07 14:24:59 +11:00
Rob Harrington
05e6c3daa6 Add message to indicate missing orders_close_at date 2018-03-02 13:28:34 +11:00
Transifex-Openfoodnetwork
7a411b0452 Updating translations for config/locales/de_DE.yml 2018-03-02 03:48:06 +11:00
Transifex-Openfoodnetwork
ecbd1fe93d Updating translations for config/locales/pt.yml 2018-03-02 02:15:53 +11:00
Enrico Stano
6e9efe79b7 Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit 
Increase default enterprise limit
 2018-03-01 14:40:24 +01:00
Rob Harrington
6bf4ed1ac5 Add new review view to subscription wizard 2018-02-22 16:13:29 +11:00
Rob Harrington
cec5fddf6a Add missing translation 2018-02-22 14:33:25 +11:00
Rob Harrington
c4a81bdc48 Translate subscriptions loading flash 2018-02-22 14:33:25 +11:00
Maikel Linke
de8df4b3e9 Manual update from transifex 2018-02-21 14:25:19 +11:00
Maikel Linke
70bb64d58d Manual update from transifex 2018-02-21 14:24:45 +11:00
Maikel Linke
a529525a63 Manual update from transifex 2018-02-21 14:24:28 +11:00
Transifex-Openfoodnetwork
50c1224139 Updating translations for config/locales/de_DE.yml 2018-02-21 10:59:20 +11:00
Pau Perez
a7dcaf15fa Enable Skylight in staging 
This is a follow-up of
https://github.com/openfoodfoundation/openfoodnetwork/pull/2070.

When running the production API key in staging, the `log/skylight.log`
showed:

```
[SKYLIGHT] [1.5.0] You are running in the staging environment but
haven't added it to config.skylight.environments, so no data will be
sent to skylight.io.
```

According to
https://www.skylight.io/support/advanced-setup#setting-up-multiple-environments
it turns out we need to create a new app for staging and use its API
key.
 2018-02-14 14:46:10 +01: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
Matt-Yorkley
237854c781 Update enterprise limit error text and use expect sytnax 2018-02-13 14:05:18 +00:00
Matt-Yorkley
d52f9fd43f Add enterprise limit modal 2018-02-13 14:05:18 +00:00
Maxime Lalisse
aef73aef38 Add translation keys 2018-02-09 22:15:02 +01:00
Maxime Lalisse
11eda94949 Add i18n for admin/orders 2018-02-09 17:40:31 +01:00
Pau Pérez Fabregat
be07996656 Merge pull request #2070 from chancancode/skylight 
Add Skylight instrumentation
 2018-02-09 08:55:30 +01:00
Rob Harrington
7017c8540c Replace references to 'standing line item' with 'subscription line item' 2018-02-09 14:44:15 +11:00
Rob Harrington
ba66c0e862 Replace references to 'standing order' with 'subscription' (schedule) 2018-02-09 14:44:14 +11:00
Rob Harrington
c605742671 Replace references to 'standing order' with 'subscription' (routes) 2018-02-09 14:44:14 +11:00
Rob Harrington
720628e49e Replace references to 'standing order' with 'subscription' (translations) 2018-02-09 14:44:14 +11:00
Rob Harrington
99db6f8e14 Fix translation key for StandingOrderValidator errors 2018-02-09 14:44:11 +11:00
Rob Harrington
4362ef2cea Properly translate all error messages for StandingOrderForm 2018-02-09 14:44:09 +11:00
Rob Harrington
7ca60e1990 Use activerecord error translations properly 2018-02-09 14:44:09 +11:00
Rob Harrington
c86207212f Add confirmation summary email 2018-02-09 14:44:08 +11:00
Rob Harrington
86cddb1cc4 Capitalise translated strings 2018-02-09 14:44:08 +11:00
Rob Harrington
b49c44f7ce Generalise record_failure method to record_and_log_error 2018-02-09 14:44:08 +11:00
Rob Harrington
13d01df4d8 Add mail method and template for sending placement summary emails to shop owners 2018-02-09 14:44:08 +11:00
Rob Harrington
26a325e6e0 Handle payment processing errors for standing orders 2018-02-09 14:44:07 +11:00
Rob Harrington
67e05cea9c Add failed payment email to StandingOrderMailer 2018-02-09 14:44:07 +11:00
Rob Harrington
ca1485f121 Add missing translations for proxy order controller error messages 2018-02-09 14:44:04 +11:00
Rob Harrington
f95d1ef058 Show message when no credit cards available for a customer 2018-02-09 14:44:04 +11:00
Rob Harrington
61b64a7516 Add credit card selection element to standing orders form 2018-02-09 14:44:04 +11:00
Rob Harrington
494f2f4821 Add cards lookup action to CustomersController 2018-02-09 14:44:04 +11:00
Rob Harrington
d3937e5c80 Move customer address lookup action to CustomersController 2018-02-09 14:44:03 +11:00
Rob Harrington
26b85052e1 Load only Cash and Stripe payment methods into standing order form actions 2018-02-09 14:44:03 +11:00
Rob Harrington
07a7993109 Require a Cash or Stripe payment method in standing order setup process 2018-02-09 14:44:03 +11:00
Rob Harrington
7798b12086 Replace translation key for yes_i_am_sure 2018-02-09 14:44:03 +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
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
0fd86a6cc7 Adding UI to require action from user when pausing/cancelling standing order with open orders 2018-02-09 14:44:02 +11:00
Rob Harrington
ab5dc7ddd5 Require action from user when pausing/cancelling standing order with open orders 2018-02-09 14:44:02 +11:00
Rob Harrington
3ce8a1abba Tweaking proxy order state logic 
Inherits 'paused' state from standing order if present
 2018-02-09 14:44:02 +11:00
Rob Harrington
ad2506fe75 Require StandingOrders to have at least one product (StandingLineItem) 2018-02-09 14:44:01 +11:00