Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
3aea387b9a
First iteration of a model for tag rules
2016-04-01 19:44:17 +11:00
Maikel Linke
3d31a37dd3
Remove unused method Enterprise::find_near
2016-03-31 15:00:22 +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
186d1c1f26
Revoking ability to create variant overrides via OC permission
2016-03-02 12:10:49 +11:00
Rob Harrington
f280b96215
Hiding a variant from inventory prevents it being available on the shopfront
...
User preferences around inventory-only product selection immediately affect the shopfront
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
095b420997
WIP: Adding InventoryItem model for managing contents of inventories
2016-03-02 12:10:22 +11:00
Maikel Linke
a7e3b2d9df
Update enterprise email tests
2016-02-24 16:21:18 +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
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Rob Harrington
9c4ed5f092
Enterprises have billable_periods
2015-09-17 22:38:08 +10:00
Rob Harrington
77e361dd52
Adding shop_trial_expiry method to enterpise model
2015-09-17 22:37:44 +10:00
Rob Harrington
2fa217df56
Adding paper_trail to enterprise model, to track changes to owner_id and sells
2015-09-17 22:37:33 +10:00
Rohan Mitchell
3f8235593a
When enterprise is deleted, delete relationships
2015-07-10 09:42:09 +10:00
Rohan Mitchell
c5526c78d9
Make enterprise name unique
2015-06-17 15:01:46 +10:00
Rob Harrington
359328a96e
Producers and distributors lists include self where appropriate
2015-06-03 16:18:44 +08:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Rohan Mitchell
69c54e1d70
Only load activated relatives for EnterpriseInjectionData
2015-05-29 12:08:21 +10:00
Maikel Linke
e4f93863fd
Finding unique permalink before validation.
2015-05-28 11:27:40 +10:00
Rob Harrington
d2e8b23dd4
Creating association between enterprise and customers
2015-05-13 12:44:37 +10:00
Rob Harrington
7ffe0f042e
Moving accessible_by scope on Enterprise to permissions
2015-05-07 12:50:55 +10:00
Rob Harrington
d8c23d37ac
Update accessible_by scope on enterprise, to read from permissions
2015-05-07 12:50:54 +10:00
Rohan Mitchell
700cb73b8f
Send enterprise confirmation emails asynchronously
2015-04-21 16:19:02 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
e9fbd74e88
Send emails via jobs instead of synchronously
2015-04-16 16:54:43 +10:00
Rohan Mitchell
e570352a1b
Grant fewer permissions on enterprise creation
2015-04-16 10:59:15 +10:00
Rob Harrington
0c155e6e3a
Display message when email has not been confirmed for new enterprise
2015-04-15 15:32:17 +10:00
Rob Harrington
3b9824171a
Adding with_order_cycles_as_supplier_outer scope to Enterprise
2015-04-02 15:53:32 +11:00
Rob Harrington
ca1a5b5f8d
Ignoring any new producer properties submitted by the user
2015-04-02 08:54:35 +11:00
Rob Harrington
bdeca54377
Reloading stale enterprise object in test
2015-03-14 16:17:16 +11:00
Rob Harrington
cb28843af1
Reload manager before ensuring owner is a manager
2015-03-14 10:41:49 +11:00
Rohan Mitchell
fa4741eb65
Update auto-creation of E2E links: more specific and restricted link creation
2015-02-26 13:49:15 +11:00
Rohan Mitchell
636ed2ad0d
Make bi-directional relationships
2015-02-13 09:24:48 +11:00
Rohan Mitchell
1d61e91afd
When enterprise created, grant permission to all co-owned enterprises, not just hubs
2015-02-13 09:24:48 +11:00
Rohan Mitchell
7ac888ae00
Admin can grant create_variant_overrides permission
2015-01-30 11:56:05 +11:00
Rob Harrington
36430d3bad
Enterprise permalink generator handles blank permalink case
2015-01-22 10:19:46 +11:00
Rob Harrington
3e5ea3fe63
Adding automatic permalink generation on enterprise creation
2015-01-22 10:19:45 +11:00
Rob Harrington
6b10a4a775
Restoring enterprise permalinks when they cause errors
2015-01-22 10:19:43 +11:00
Rob Harrington
c3659612ed
enterprise routes use permalink
2015-01-22 10:19:42 +11:00
Rob Harrington
9f0aeb5adf
Adding unique permalink to enterprises
2015-01-22 10:19:41 +11:00
summerscope
d2d3a577ea
Merging master into this branch to make it easy to pull for staging push
2015-01-15 17:38:35 +11:00
Rob Harrington
21e4f40616
Implementing primary taxon ordering on the shopfront
2014-12-19 14:05:23 +11:00
Rob Harrington
fcb14f32d2
Validating user input for shopfront taxon order
2014-12-19 14:04:02 +11:00
