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
f263ef7dc0
Add selectable checkboxes
2019-01-10 09:57:06 +00: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
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
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
Maikel Linke
a8ccb9b818
Explain why we look for the closest tax rate of a fee
2019-01-04 17:24:45 +11:00
Pau Perez
ddf916814f
Reduce complexity of EnterprisesController#shop
...
As asked by Rubocop.
2019-01-03 11:17:10 +01:00
Pau Perez
51da607ab1
Fix too long line
2019-01-03 11:17:10 +01:00
Pau Perez
46760ce28c
Do not double-render when there is no stock
2019-01-03 11:17:10 +01:00
Pau Perez
cca15e75a6
Refactor to reveal how we load enterprises in shop
...
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.
This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
2019-01-03 11:17:10 +01:00
Maikel
f68fd6eea9
Merge pull request #3242 from luisramos0/2-0-line-item-destroy
...
[Spree Upgrade] Fix line item destroy by forcing quantity to zero and update_inventory
2019-01-02 17:44:25 +11:00
Alvaro Chalar
6dccbeca70
Add custom footer message in reports section
2018-12-27 12:22:48 +01:00
luisramos0
d44c4778e1
Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read
2018-12-24 16:39:06 +00:00
Pau Pérez Fabregat
1ab50798fe
Merge pull request #3189 from luisramos0/3043-i18n-emails
...
Make all mailers use appropriate locale when sending emails
2018-12-24 14:59:04 +01:00
luisramos0
429e513a77
Improve line_item code by moving order.shipment reload to a line_item after_destroy hook
2018-12-23 09:15:18 +00:00
luisramos0
b83ec8d357
Add order.shipments reload to line_item.update_inventory. This is necessary when destroying line items as update_inventory may delete the shipment from the order
2018-12-23 00:23:49 +00:00
luisramos0
26b5250f2c
Fix line item destroy by forcing quantity to zero and update_inventory before_destroy so that the variant is restocked
2018-12-22 23:27:27 +00:00
luisramos0
7155f28acf
Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details
2018-12-21 15:13:43 +00:00
luisramos0
6c70998b64
Move StockLocation.fill_status to VariantStock so we can easily override it
2018-12-21 11:33:07 +00:00
luisramos0
17ced61b3d
Override Spree::Variant.in_stock? in VariantStock so that we don’t depend on Spree::Stock::Quantifier
2018-12-21 11:33:07 +00:00
luisramos0
1835d97013
Adapt line_item.sufficient_stock? to spree 2
2018-12-21 11:33:07 +00:00
luisramos0
d641705053
Add variant scoping to availability_validator_decorator by using line_item.scoper and moving Spree::Stock::Quantifier.can_supply? to VariantStock so that it becomes overridable
2018-12-21 11:33:07 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
luisramos0
c1aeb2e9a3
Improve naming in availability_validator_decorator and cover it with tests
2018-12-20 14:26:34 +00:00
luisramos0
bc22b0a58e
Fix capping quantity to stock levels by always validating line items with quantity zero
...
Stock::Quantifier.can_supply? returns false for an input of zero when stock level is negative
2018-12-20 14:26:34 +00:00
luisramos0
3085e15961
Fix order factory by making line_item.skip_stock_check work in spree 2
2018-12-20 14:26:34 +00:00
luisramos0
88b1bb61d6
Fix availability validator to include inventory_units in it's validation
2018-12-20 14:26:34 +00:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
Maikel Linke
a978e992bf
Remove tax_rates shortcut from adjustment
...
Becoming less dependent on Spree, using our own namespace, keeping
decorators small.
2018-12-19 14:42:38 +11:00
Maikel Linke
fc1b182275
Simplify method complexity and comply with rubocop
2018-12-19 14:31:29 +11:00
Maikel Linke
3169a384ba
Find approximate tax rate if no other is found
...
There are several cases in which a tax rate is not associated with an
adjustment. We find the closest one for reporting here. It is not a good
solution, but a workaround introduced for reporting:
https://github.com/openfoodfoundation/openfoodnetwork/pull/1496
2018-12-19 14:31:29 +11:00
Maikel Linke
a341561446
Move tax rate finding into service and spec it
...
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
Maikel
84f2f9af3c
Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
...
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
luisramos0
5e960512ac
Set user locale on user registrations #create
...
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
2018-12-18 15:30:01 +00:00
