Lynne Davis
b43e770420
Removing incorrect angular watch
2016-03-16 14:17:43 +00:00
Maikel
4adf332480
Auto-merged master into uk/trial-length on deployment.
2016-03-16 22:42:50 +11:00
Lynne Davis
a4efd3d44c
Adding configurable Shop Trial Length in business model
2016-03-16 11:35:31 +00:00
Maikel Linke
21a7942de6
Merge remote-tracking branch 'origin/master' into indicate-required-fields-for-new-enterprise-form
2016-03-11 14:14:45 +11:00
Maikel Linke
28e2d4041f
Hide create-enterprise-group button from non-admins
...
Only admin users can create groups. The button was still displayed for
users that owned a group.
Unused HTML attributes were removed from that button as well.
2016-03-04 14:24:24 +11:00
Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
aff346071f
Automatically selecting a hub on inventory page when it is the only option
2016-03-02 12:10:49 +11:00
Rob Harrington
3f466e86b6
Renaming 'Override Variant Details' permission to 'Add Products To Inventory'
...
Style changes to make enterprise relationships page more useable
2016-03-02 12:10:49 +11:00
Rob Harrington
e00fe824ac
Updating text for inventory only product selection setting for enterprises
2016-03-02 12:10:49 +11:00
Rob Harrington
4de0a5c220
Renaming 'Variant Overrides' index page to 'Inventory'
2016-03-02 12:10:22 +11:00
Rob Harrington
6ee4e4190e
New product count for inventory takes permissions into account
2016-03-02 12:10:22 +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
f288c09380
Moving inventory settings to their own section within the enterprise edit form
2016-03-02 12:10:22 +11:00
Rob Harrington
488daed8f3
Translating variant overrides / inventory page
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
Rob Harrington
28b143da73
WIP: Splitting Variant overrides into views
2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522
WIP: Adding Loading flash to variant overrides page
2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68
WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
a66582a8fb
WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model
2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0
Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising
2016-03-02 11:56:46 +11:00
Maikel Linke
68f3d0951a
Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form
...
Conflicts:
app/views/admin/enterprises/_new_form.html.haml
2016-02-24 15:36:25 +11:00
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
977ff7b35d
Fix compatibility issues with new version of select2
2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Rohan Mitchell
17cda86dfa
Replace with-tip with ofn-with-tip: enterprise groups
2016-02-24 11:26:37 +11:00
Rohan Mitchell
bdd6d3ba6b
Replace with-tip with ofn-with-tip: business model configuration
2016-02-24 11:26:37 +11:00
Rohan Mitchell
b4976a5445
Replace with-tip with ofn-with-tip: enterprise forms
2016-02-24 11:26:37 +11:00
Rob Harrington
9979e31220
Final tidy up after rebasing default_inventory and ng-vo onto origin/master
...
Fixes a few VO feature specs and a few interface tweaks
2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41
Variant Overrides Index: User can manually reset inheritance
2016-01-15 09:07:51 +11:00
Rob Harrington
607a66b6c6
WIP: Fixing a few broken VO specs
2016-01-15 09:07:50 +11:00
Steve Pettitt
e423e890e0
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
2016-01-15 09:07:50 +11:00
Steve Pettitt
25454d3e97
Added new fields to fix VO deletion feature specs
2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3
Added angular service tests for variant overrides stock reset
2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08
WIP: Adding view and routes for resetting variant_overrides count_on_hand
2016-01-15 09:07:48 +11:00
Rob Harrington
64cd52e067
Adding SKU and on demand to a few VO specs
2016-01-13 18:49:34 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Rob Harrington
cab6871de3
Pulling bulk actions dropdown out into partial
2016-01-13 18:49:33 +11:00
Rob Harrington
7cd8f35ac8
Tidying up styling and use of skeleton columns on index pages
2016-01-13 18:49:33 +11:00
Rob Harrington
2b70ddb23c
Adding columns toggle to variant overrides index
2016-01-13 18:49:33 +11:00
Rob Harrington
9eaec6061e
Pulling columns dropdown out into a shared partial
2016-01-13 18:49:32 +11:00
Rob Harrington
54e7677888
Integrating StatusMessages into save-bar, adding to variant overrides index
2016-01-13 18:49:32 +11:00
Rob Harrington
c781113a65
Adding filters to variant overrides interface
2016-01-13 18:49:32 +11:00
Rob Harrington
4237a83028
Moving components required for variant overrides into appropriate modules
2016-01-13 18:49:32 +11:00
Rob Harrington
e0da49e4df
Formatting dates for account invoices in rails time zone
2015-12-17 11:34:06 +11:00
Rob Harrington
83e3fb98f7
Only display billable period adjustments where the amount in > 0
...
Rather than where the bill (which is calculated according to current settings) is > 0
2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
0ed8cf973d
Adding an example bill calculator to business model config edit page
...
To allow super admin to see the effects of any changes they make to BMC settings
2015-12-16 19:18:58 +11:00
