Matt-Yorkley
563f9a4f5f
Remove another N+1
2019-05-29 12:28:56 +01:00
Matt-Yorkley
2dd4c1ccaf
Cut OC edit #for_order_cycle queries in half
2019-05-29 10:01:46 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Kristina Lim
56bc497fe2
Simplify code for enterprise serializer for OCs
2019-05-06 23:49:55 +08:00
Kristina Lim
4430c88a95
Eager-load some data for admin order cycle pages
2019-05-06 15:41:29 +08:00
luisramos0
a36722cebf
Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand
2019-02-26 12:47:11 +00:00
Maikel Linke
99f0be2f1c
Remove unnecessary scope Variant.not_deleted
...
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.
Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
luisramos0
30967a5ffa
Fix bulk product edit page. on_hand and on_demand should never be mixed on the server side, the UI can make the decision to show on_demand on the on_hand column if on_demand is true
2019-02-18 22:01:48 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Kristina Lim
b691d727a7
Move OFN::SubscriptionService to SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
Luis Ramos
0ea0016fc9
Merge pull request #2998 from coopdevs/adapt-product-on-demand
...
[Spree Upgrade] Adapt product on demand
2018-11-08 19:21:46 +00:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Luis Ramos
0c02e8c15f
Merge pull request #2981 from coopdevs/remove-commented-out-code
...
Remove old commented out code
2018-11-06 16:06:59 +00:00
Pau Perez
71702af3c3
Have a single attributes list in serializer
2018-11-06 15:52:02 +00:00
Pau Perez
51155bb368
Remove old commented out code
...
You know, git already keeps old code for us.
2018-11-06 14:23:15 +00:00
Pau Perez
26d95b7250
Fix long lines
2018-11-06 13:59:51 +00:00
Matt-Yorkley
d0b7b57017
Remove OrderSerializer#show_path and adjust to use #edit over #show
2018-11-06 11:07:14 +00:00
luisramos0
d0d9038308
Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2
2018-10-22 11:24:01 +01: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
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02: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
Matt-Yorkley
55d7d5d1e4
Rename #capture_path to #payment_capture_path
2018-10-02 11:10:51 +01:00
Matt-Yorkley
54b17ac701
Use Spree::Order.pending_payments and remove service
2018-09-27 13:04:56 +01:00
Matt-Yorkley
1d9243af19
DRY and clarify serializer and service
2018-09-24 16:58:43 +01:00
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
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Kristina Lim
f30032eee7
Include image URLs in serialized enterprise for admin
2018-09-04 01:18:45 +08:00
Maikel Linke
f0be8ff290
Style proxy order serializer
2018-08-03 15:07:22 +10:00
Rob Harrington
cead905d05
Use estimated subscription total for proxy orders if order has not been initialized
2018-08-03 12:14:25 +10:00
Maikel Linke
459057a7db
Revert accidental copy and paste
2018-07-10 10:31:51 +10:00
Maikel Linke
f9a3338755
Simplify serialiser with delegate
2018-07-10 10:01:18 +10:00
Maikel Linke
b478ef9fd0
Make admin serialiser specs runnable on their own
2018-07-10 09:59:00 +10:00
Rob Harrington
4fd333bbaf
Remove obsolete reference to credit_card from subscription serializer
2018-07-05 19:26:12 +10:00
Rob Harrington
e0d46aa105
Add new serializer to allow search for customer addresses
2018-07-05 19:26:12 +10:00
Rob Harrington
a03dd1e10c
Serialize default card auth and presence for Customers
2018-07-05 19:26:11 +10:00
Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
Matt-Yorkley
4e97445655
PI inventories timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Rob Harrington
f1545a4ab6
Show fee estimates in subscription totals in UI
2018-03-02 10:11:26 +11:00
Rob Harrington
30df1d4345
Refector controller to allow price_estimate calculation
2018-03-02 10:11:26 +11: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
