Hugo Daniel
026fe55f1d
Add I18n keys for order state and order firstname and lastname filters
2019-01-10 15:32:23 +01:00
Transifex-Openfoodnetwork
e70b8c03ce
Updating translations for config/locales/nb.yml
2019-01-10 22:18:58 +11:00
Matt-Yorkley
e624faaacb
Add 'please wait' message to bulk invoice modal
2019-01-10 09:57:06 +00:00
Matt-Yorkley
0e478ff501
Increase polling to 150 seconds maximum before showing error message.
2019-01-10 09:57:06 +00:00
Matt-Yorkley
66ac61f591
Rename background processing method
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6
Add Service and remove Job
2019-01-10 09:57:06 +00:00
Matt-Yorkley
003014daf8
Extract invoice methods from ordersCtrl
2019-01-10 09:57:06 +00:00
Matt-Yorkley
bb814f91ef
Extract timeout to named function
2019-01-10 09:57:06 +00:00
Matt-Yorkley
6b6a41cfbc
Update CSS
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
b0f75162ac
Add delayed job for create bulk invoice
2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657
Move bulk invoice to new RESTful route
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4a88fb0626
Use simpler array for selected ids
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5279210254
Improve invoice order querying
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f3585befff
Fix customer missing from some order records - guest checkout?
2019-01-10 09:57:06 +00:00
Matt-Yorkley
24207053e4
Reset selected orders on filter change
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5cc8bad42b
Improve UI layout for select all option
2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635
Disable button unless orders selected
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Matt-Yorkley
96d530b473
Tidy up invoice template selection
2019-01-10 09:57:06 +00:00
Matt-Yorkley
9a71236abd
Add combine_pdf gem
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f263ef7dc0
Add selectable checkboxes
2019-01-10 09:57:06 +00:00
Maikel
4f5bb96484
Merge pull request #3300 from openfoodfoundation/transifex
...
Transifex
2019-01-10 17:52:28 +11:00
Maikel Linke
199dee3f64
Use install-bundler in setup script
2019-01-10 17:44:13 +11:00
Maikel Linke
dafa433788
Add script to install required bundler version
...
The newest version of bundler is not compatible with our current version
of Ruby. This script helps to install the bundler version defined in
Gemfile.lock.
2019-01-10 17:44:09 +11:00
luisramos0
292f22af4e
Adapt factory completed_order_with_fees to new parent order_with_totals_and_distribution by cleaning up duplicate shipping fees
2019-01-09 23:31:40 +00:00
Transifex-Openfoodnetwork
15e197b3b0
Updating translations for config/locales/en_GB.yml
2019-01-10 07:31:46 +11:00
luisramos0
e787a317dc
Adapt user_balance_calculator_spec to new order_with_totals_and_distribution with shipping fee correctly included in its total
2019-01-09 16:02:09 +00:00
luisramos0
e45f7571fb
Fix order_with_totals_and_distribution by updating shipping fees
2019-01-09 15:20:28 +00:00
Pau Pérez Fabregat
0eefd2455c
Merge pull request #3293 from luisramos0/2-0-stable-jan-8th
...
[Spree Upgrade] Merging master into 2-0-stable (first run in Jan2019)
2019-01-09 16:11:18 +01:00
Pau Pérez Fabregat
399cc5f796
Merge pull request #3224 from alvaro-chalar/footer-message
...
Add custom footer message in reports section
2019-01-09 16:01:02 +01:00
Pau Pérez Fabregat
1815a2116d
Merge pull request #3257 from coopdevs/refactor-enterprise-controller-shop-injection
...
Refactor to reveal how we load enterprises in shop
2019-01-09 13:21:56 +01:00
Maikel
abe4f78e5c
Merge pull request #2988 from Matt-Yorkley/pi/utf8
...
Pi/utf8
2019-01-09 15:39:05 +11:00
Pau Pérez Fabregat
57267ab4a4
Merge pull request #3297 from openfoodfoundation/transifex
...
Transifex
2019-01-08 22:45:55 +01:00
Transifex-Openfoodnetwork
f05f4ce0b1
Updating translations for config/locales/en_GB.yml
2019-01-09 07:06:27 +11:00
Pau Pérez Fabregat
bd10400457
Merge pull request #3295 from coopdevs/pull-translations
...
Update all locales with the latest Transifex translations
2019-01-08 17:58:51 +01:00
Pau Perez
f1f1ab9daf
Update all locales with the latest Transifex translations
2019-01-08 17:17:35 +01:00
luisramos0
2cc8a0e9e3
Fix models/variant_override_spec by setting mandatory on_demand true when count_on_hand is nil
2019-01-08 15:32:10 +00:00
luisramos0
134a51ab1d
Fix merge typo in the cancel email method of the order mailer decorator
2019-01-08 15:31:28 +00:00
luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
Maikel
14ccb39478
Merge pull request #3287 from luisramos0/2-0-edit-variants
...
[Spree Upgrade] Fix variant edit page optiontype deface code
2019-01-08 16:37:38 +11:00
Maikel
abbbfd6191
Merge pull request #3286 from luisramos0/2-0-order-spec
...
[Spree Upgrade] Fix specs in admin orders spec
2019-01-08 16:35:59 +11:00
Maikel
a46180ef78
Merge pull request #3282 from luisramos0/2-0-credit-card
...
[Spree Upgrade] Fix credit card spec that was depending on current year
2019-01-08 16:34:03 +11:00
Maikel
68df27df02
Merge pull request #3281 from luisramos0/2-0-tab-ransl
...
[Spree Upgrade] 3119, 3112 and 3073 - fix menu translations
2019-01-08 16:31:41 +11:00
luisramos0
676f0e71b8
Fix variant edit page optiontype deface code
2019-01-07 12:16:47 +00:00
luisramos0
bdefc0ebd1
Fix admin orders spec by adapting the spec to the recently de-defaced page
2019-01-07 12:16:28 +00:00
luisramos0
42eb92c40a
Add missing translation related to capture payments in the backoffice
2019-01-07 12:16:28 +00:00
luisramos0
503d515930
Fix credit card spec that was depending on current year
...
After this commit 5d93d1dedb3f33e28839
2019-01-07 12:16:09 +00:00
luisramos0
d3325ed7bb
Add translation entries for admin menu tabs.
...
This was moved to new namespace tab in spree 2, see 4c82bfdf48
2019-01-07 12:15:36 +00:00
Luis Ramos
db6d39cedd
Merge pull request #3277 from openfoodfoundation/revert-3246-2-0-create-variants
...
Revert "[Spree Upgrade] Set on_demand default value to false in test factories"
2019-01-07 11:46:37 +00:00
