Rohan Mitchell
|
29235cd2cb
|
Merge branch 'master' into product-amount-units
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
spec/spec_helper.rb
|
2014-01-14 15:34:05 +11:00 |
|
Rohan Mitchell
|
28c641a932
|
Remove redundant test stubs
|
2014-01-10 15:44:16 +11:00 |
|
Rohan Mitchell
|
a60c9a9cea
|
When variant already has a value set, remove old option value and assign a new one
|
2014-01-09 14:11:54 +11:00 |
|
Rohan Mitchell
|
cbe46bffed
|
Merge branch 'bpe_paginate'
Conflicts:
config/ng-test.conf.js
|
2014-01-09 12:07:42 +11:00 |
|
Will Marshall
|
7838d759ee
|
Removing redundant functionality from the Order Populator
|
2014-01-08 14:45:40 +11:00 |
|
Rohan Mitchell
|
5f4d787d26
|
Fix sorting error in spec
|
2014-01-08 14:43:46 +11:00 |
|
Rohan Mitchell
|
ea3e697b73
|
Rename method for clarity, remove outdated specs for OrderPopulator
|
2014-01-08 14:14:45 +11:00 |
|
Rohan Mitchell
|
70e16433d3
|
Spec for reusing existing option values
|
2014-01-08 10:16:38 +11:00 |
|
Rohan Mitchell
|
2fec16af5d
|
Merge branch 'master' into product-amount-units
|
2014-01-07 16:00:06 +11:00 |
|
Rohan Mitchell
|
9e6fa4d22d
|
Add spec for small values
|
2014-01-07 15:02:55 +11:00 |
|
Rohan Mitchell
|
ebae76375f
|
Fix specs to work with unit_value stored in base units, scale units correctly for output
|
2014-01-07 14:57:30 +11:00 |
|
Rohan Mitchell
|
5a1249e249
|
When value is blank, display description only
|
2014-01-07 12:19:48 +11:00 |
|
Rohan Mitchell
|
35d0bf6219
|
Generate option value values and units for weight, volume and items
|
2014-01-07 12:07:54 +11:00 |
|
Rohan Mitchell
|
ef6c08408b
|
Generate option value name - value and description
|
2014-01-07 10:57:58 +11:00 |
|
Rohan Mitchell
|
9e956ebec6
|
Add specs for option value creation, create option values for simple case. Delete option value associations, not objects.
|
2014-01-07 10:36:19 +11:00 |
|
Rohan Mitchell
|
6a4c112cf2
|
Rename option_type_for_variant_unit to variant_unit_option_type
|
2014-01-07 10:31:53 +11:00 |
|
Will Marshall
|
f6af9e78ac
|
Adding destroy ability to enterprise users
|
2013-12-13 15:40:23 +11:00 |
|
Rohan Mitchell
|
1084862139
|
When product variant unit is changed, remove related option values from variants
|
2013-12-13 12:08:51 +11:00 |
|
Rohan Mitchell
|
f2269654ff
|
Set option type on product when variant unit changed
|
2013-12-13 11:07:57 +11:00 |
|
Rohan Mitchell
|
1b63546a9e
|
Master variants are valid without unit value or description
|
2013-12-05 15:16:51 +11:00 |
|
Rohan Mitchell
|
0bae3e58b8
|
Add product units and amount fields to product and variant models, add validations
|
2013-12-05 15:16:51 +11:00 |
|
Will Marshall
|
7784a6ef44
|
Adding a default value of NOW to available_on on Products
|
2013-11-28 16:41:46 +11:00 |
|
Rohan Mitchell
|
dfcf567f26
|
Sort payment methods by name
|
2013-11-21 14:42:28 +11:00 |
|
Will Marshall
|
2ce687fc79
|
Adding variant update permissions to Enterprise users
|
2013-11-14 11:53:14 +11:00 |
|
Rohan Mitchell
|
27b8c4508f
|
Split product distribution editing into its own admin page
|
2013-11-13 15:22:17 +11:00 |
|
Rohan Mitchell
|
48f18a93de
|
Order shipping methods by name, not distributor
|
2013-11-07 16:25:43 +11:00 |
|
Will Marshall
|
f0d335a454
|
Fixing up the failing spec for distributor changes, reworking a method to SharedHelper
|
2013-11-07 11:47:05 +11:00 |
|
Rohan Mitchell
|
bd112c64b0
|
Fix edit enterprise link to point to edit page, fix spec breakages
|
2013-10-18 15:39:58 +11:00 |
|
Rohan Mitchell
|
91f14dcd4c
|
Enterprise manager can create/edit enterprise fees
|
2013-10-18 13:56:22 +11:00 |
|
Rohan Mitchell
|
3b5e6f5742
|
When viewing shipping methods, only show those for the distributor I select
|
2013-10-18 10:01:11 +11:00 |
|
Rohan Mitchell
|
c07c52085a
|
Enterprise user can view and create shipping methods
|
2013-10-18 09:35:53 +11:00 |
|
Rohan Mitchell
|
e6041aaf2f
|
Enterprise user can view, create and edit payment methods
|
2013-10-18 09:09:53 +11:00 |
|
Rohan Mitchell
|
93cb845ee2
|
DB and model changes to make ShippingMethod distributor habtm
|
2013-10-17 11:15:43 +11:00 |
|
Rohan Mitchell
|
8654f23a19
|
Move spree model decorator specs into their own dir to mirror model dir layout
|
2013-10-17 09:53:54 +11:00 |
|