Pau Perez
51e277a183
Make test setup more readable
2018-12-14 15:12:41 +01:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Pau Perez
e0f43191e2
Make helper methods private
...
Otherwise next dev might think these are attributes of the resulting
JSON serialized object.
They just made the refactoring a bit easier.
2018-11-28 16:21:40 +01:00
Pau Perez
e40c1c08ca
Refactor spec to not stub the class under test
...
This also relies on ActiveRecord which will come in handy as we move on
the refactor.
2018-11-28 16:21:40 +01:00
Pau Perez
149fc1ac6f
Inline PropertyMerge's #merge into serializer
...
Now that it has become a plain Ruby #uniq, there's no point on having
the abstraction and indirection.
2018-11-28 16:21:40 +01:00
Pau Perez
bc7258d43b
Test #supplied_properties helper methods
2018-11-28 16:21:40 +01:00
Matt-Yorkley
3f33e28839
Fix outdated credit card spec
2018-11-07 20:48:54 +00:00
Pau Pérez Fabregat
db9669b4ce
Merge pull request #2817 from coopdevs/remove-reference-to-on-demand
...
[Spree Upgrade] Remove on_demand from Product serializers
2018-10-16 17:52:42 +02:00
luisramos0
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01:00
Pau Perez
75ad4254a6
Remove on_demand from Api::Admin::ProductSerializer
...
This change also moves the spec file to its appropriate place for the
sake of consistency and RSpec3-izes the test example.
2018-10-03 13:06:13 +02: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
luisramos0
8e5f43ed25
Fixed current order serializer spec name
2018-09-14 23:12:00 +01:00
Kristina Lim
f30032eee7
Include image URLs in serialized enterprise for admin
2018-09-04 01:18:45 +08:00
Maikel Linke
b478ef9fd0
Make admin serialiser specs runnable on their own
2018-07-10 09:59:00 +10:00
Rob Harrington
e0d46aa105
Add new serializer to allow search for customer addresses
2018-07-05 19:26:12 +10:00
Pau Perez
33ea2c0b07
Auto correct Rubocop's Layout/FirstParameterIndentation cop
2018-04-09 18:47:18 +02:00
Pau Perez
e876ef7df1
Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop
2018-04-09 17:22:52 +02:00
Pau Perez
6cb038c362
Autocorrect rubocop Layout/BlockEndNewline cop
2018-02-01 09:52:53 +01:00
Rob Harrington
6c38997010
Fix 1664: product tag rules not working
...
Caused by a combination of: fe7bd5e2cd38d3b446cc
2017-11-15 10:26:24 +11:00
Rob Harrington
393a4efbf6
Fix flaky OrderSerializer spec
...
Make sure that completed payment is for an amount less that the order total
2017-09-23 14:58:35 +10:00
Rob Harrington
42dd58426e
Auto-correct rubocop offences for stripe-connect
2017-09-23 14:58:32 +10:00
Rob Harrington
b9d72ce4cf
Refactoring logic for displaying orders on the front-end account page
2017-09-23 14:58:32 +10:00
Rob Harrington
f4c3fbf8bc
Refactoring credit cards interface, and backend logic
2017-09-23 14:58:32 +10:00
stveep
33b570b117
Inject cards for current user into checkout and add selector dropdown to gateway partial.
2017-09-23 14:58:31 +10:00
Duende13
705295049e
Improved test for variant serializer
2017-07-21 10:18:55 +10:00
Duende13
a07fd854f6
New test for variant serializer
2017-07-21 10:18:55 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Bing Xie
1877bea68d
Customer serializer without tag_rule_mapping option
2016-10-21 10:51:36 +11:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4ee8f96e4818
2016-09-18 17:46:43 +10:00
Rohan Mitchell
e8f96e4818
When a shop is open, only show taxon badges for currently open order cycles
2016-09-16 11:47:45 +10:00
Bing Xie
5b40c745f3
Add address serializer to customer serializer
2016-08-12 14:44:59 +10:00
Bing Xie
7f203f5491
Show billing address and shipping address on customers index page
2016-08-12 14:44:59 +10:00
Rob Harrington
ddcfe1535a
Making TagRule autocomplete available to models other than Customer
...
Incorporate ng admin.tags module and rails TagController into existing admin.tagRules module + TagRuleController
2016-05-25 08:10:20 +10:00
Maikel Linke
fa5fa9e228
Auto-complete tags on customers page
...
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
2016-04-29 15:18:17 +10:00
Maikel
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
Maikel Linke
d925c2aefc
Translate Spree payment, shipment and order states
...
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.
- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.
- Removed `humanize` call from order serializer and added translation
scopes to accounts page.
- Test OrderSerializer for untranslated attributes
- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
aa8457c40f
Fix order serializer spec: change from id to number
2016-01-26 19:03:19 +00:00
stveep
48896ab3d8
More serializer specs
2015-12-22 15:09:24 +00:00
stveep
668c6ff74f
Order serializer spec
2015-12-21 23:22:15 +00:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
795830d94d
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
2015-10-28 13:07:31 +11:00
Rob Harrington
e575b0e490
Switching enterprise index to its own dedicated serializer, so we can spit out ownership
2015-06-12 01:49:37 +08:00
Rohan Mitchell
d478cc1f69
Serialize taxons and relatives in expected format
2015-05-29 14:03:44 +10:00
Rohan Mitchell
75f1f673ad
Update spec for EnterpriseSerializer
2015-05-27 16:26:31 +10:00
Rohan Mitchell
99cb09c6f7
When loading products for shopfront, load all variants in one go
2015-05-27 15:44:01 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
