Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Hugo Daniel
0d7e24e554
Change to new ruby hash syntax
2018-09-20 14:34:10 +02:00
Hugo Daniel
b0fa76f519
Change to new ruby hash syntax
2018-09-20 14:32:27 +02:00
Hugo Daniel
07cbb08b42
Change to new ruby hash syntax
2018-09-20 14:28:20 +02:00
Pau Pérez Fabregat
3dd1fcbc72
Merge pull request #2749 from luisramos0/delete-li-ship-method-name
...
Drop unused db column line_items.shipping_method_name
2018-09-20 13:26:26 +02:00
Hugo Daniel
56c1b073ee
Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378
Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c
Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-20 12:34:16 +02:00
Matt-Yorkley
897e43fe0b
Remove Spree's Deface data-hooks from new view
2018-09-20 11:33:22 +01:00
Maikel Linke
5763bf0518
Update all translations
2018-09-20 10:33:02 +10:00
luisramos0
0e6b0aa248
Deleted sample specs and one pending spec
2018-09-19 23:45:00 +01:00
Matt-Yorkley
fc68e28e4d
Add :description to non-updatable attributes list
2018-09-19 22:30:10 +01:00
Matt-Yorkley
ebb18e9394
Remove unneccesary method
2018-09-19 21:12:30 +01:00
Matt-Yorkley
cc98cc832c
Prefer #public_send over #send
2018-09-19 21:12:30 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Pau Perez
0ac16ce096
Get useful feedback from Rubocop Metrics cops
...
One of the biggest pros of linters like Rubocop is to get valuable feedback to
help write better code. The way we have Rubocop configured now we don't prevent
new code from adhere improved code quality and this is specially important when
touching code that already suffers from complexity.
Without all Rubocop's Metrics cops enabled there's no way to get this insights
and write better code. This enables them while regenerating the
`.rubocop_todo.yml` to hide the current violations.
So, next time we touch existing code that we think could be simpler, we should
go to `.rubocop_todo.yml` and remove any occurrences of the file in question.
This way we could Rubocop's feedback right in the editor. This is tremendously
helpful when refactoring. It shows you where to start.
2018-09-19 19:27:40 +02:00
Pau Pérez Fabregat
62bebdb15e
Merge pull request #2698 from openfoodfoundation/dependabot/bundler/uglifier-4.1.19
...
[Security] Bump uglifier from 2.7.1 to 4.1.19
2018-09-19 18:02:06 +02:00
luisramos0
57bb1fec9a
Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour
2018-09-19 16:21:12 +01:00
Pau Perez
a2b3d8372e
Reduce complexity of OrderUpdater decorator
2018-09-19 16:03:33 +02:00
Pau Pérez Fabregat
99ba9d7d1b
Merge branch '2-0-stable' into unit-test-variant-stock
2018-09-19 15:41:21 +02:00
Pau Perez
b77dd41eb0
Refactored spree/order_details, extracted delivery and pickup details into separate partials.
...
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Pau Perez
0491a96d44
Ask to use backorderable? instead of on_demand
2018-09-19 15:12:38 +02:00
Transifex-Openfoodnetwork
454cd8bfbf
Updating translations for config/locales/nb.yml
2018-09-19 22:30:06 +10:00
HugsDaniel
c4d4b52668
Merge pull request #2742 from openfoodfoundation/transifex
...
Transifex
2018-09-19 14:18:03 +02:00
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9ce32e3c14
Add new ordersCtrl spec
2018-09-19 13:00:30 +01:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
luisramos0
524f9af148
Drop unused db column line_items.shipping_method_name
2018-09-19 11:38:19 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Transifex-Openfoodnetwork
f0d015be0d
Updating translations for config/locales/de_DE.yml
2018-09-19 08:34:42 +10:00
Transifex-Openfoodnetwork
258347bc63
Updating translations for config/locales/fr.yml
2018-09-19 01:45:12 +10:00
luisramos0
edcdf59621
In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec.
2018-09-18 16:11:01 +01:00
Pau Perez
314ad5400f
Move variant_stock.rb to concerns/
2018-09-18 12:18:50 +02:00
Pau Pérez Fabregat
9f7d24934d
Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters
...
Translate "Any Enterprise" and "Any Schedule" in OC filters
2018-09-18 11:42:19 +02:00
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
Pau Perez
1fdc578901
Increase readability (a bit) of OrderUpdater
2018-09-18 11:20:32 +02:00
Pau Perez
99cdeca0b1
Remove useless RSpec context block
2018-09-18 11:20:32 +02:00
Pau Perez
13f73b4512
Test :restart_checkout state machine event
2018-09-18 11:20:32 +02:00
Pau Pérez Fabregat
e79f7c13f1
Merge pull request #2727 from luisramos0/2-0-shipment-adjustment
...
[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
2018-09-18 09:37:10 +02:00
Maikel
1130bb341d
Merge pull request #2677 from luisramos0/2-0-sample-data
...
[Spree Upgrade] Fixed db:load_sample_data
2018-09-18 16:37:22 +10:00
Maikel
19df4ff640
Merge pull request #2701 from mkllnk/2700-improve-product-refresh-scheduling
...
2700 improve product refresh scheduling
2018-09-18 12:09:24 +10:00
dependabot[bot]
ccf7d91487
Bump oj from 2.1.2 to 3.6.10
...
Bumps [oj](https://github.com/ohler55/oj ) from 2.1.2 to 3.6.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/commits/v3.6.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-17 19:16:27 +00:00
luisramos0
c22ac0086b
Moved cookies_policy_helper to Web engine and respective spec
2018-09-17 16:05:38 +01:00
