Pierre de Lacroix
88a09da325
fix for pull request #1374
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
7925af30d6
add enterprise logo and custom text on invoices
2017-03-15 15:03:18 +11:00
François Turbelin
be6b09a6e0
Adding i18n keys on JS templates
2017-03-12 12:22:13 +01:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Matt-Yorkley
6bed94a09b
Include E2E permissions
2017-01-22 18:42:23 +00:00
Maikel Linke
44970a13bb
Fix translation of email confirmation notice
...
The `_html` suffix was missing leading to `<br />` being displayed in
plain text. The new version also integrates the email address as a
variable in the translation.
2017-01-13 10:21:25 +11:00
François Turbelin
88dea0f2b8
Adding i18n keys on Admin side (Rails views)
2017-01-11 10:00:06 +11:00
Matt-Yorkley
287e0b5b55
Enterprise switcher and navigation check
2016-12-09 15:15:42 +00:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Maikel Linke
08b9b50f33
Re-phrase shop options
2016-10-07 13:17:28 +11:00
Maikel Linke
c59cd21698
Add option 'allow guest orders' to enterprise
...
An enterprise manager can choose to allow guest orders (default) or
require a valid login for checkout.
2016-10-05 14:04:08 +11:00
Maikel Linke
92694c729f
Move 'shopfront requires login' setting
...
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.
Solves issue #901 .
2016-10-05 14:04:08 +11:00
Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
da55eb6d27
Form for changing enterprise type specifies trial length
2016-09-07 11:13:05 +10:00
Bing Xie
c003dcded9
Update editing enterprise page save-bar
2016-06-15 10:51:34 +10:00
Bing Xie
41837eb31d
Tweak create order cycle spec
2016-06-15 10:51:34 +10:00
Bing Xie
860a537f30
Add save bar to bulk editing product page
2016-06-15 10:51:34 +10:00
Bing Xie
d8bf66a6c9
Use save bar on enterprise editing page
2016-06-15 10:51:34 +10:00
Bing Xie
2065d81bb4
Use save bar directive in enterprise editing page
2016-06-15 10:51:34 +10:00
Continuous Integration
ee10a4b173
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-01 12:16:10 +10:00
Rob Harrington
98f8f7b89f
Adding new help-modal dialog, use for explaining tag rule UI
2016-05-28 01:16:07 +10:00
Rob Harrington
12e685bd92
Restricting number of tags for tag rules to one
2016-05-27 16:25:10 +10:00
Rob Harrington
a1c7a44fa0
Tag Rules can be rearranged in UI to set priority
2016-05-27 16:25:10 +10:00
Rob Harrington
fa3b43a970
Adding default tag rules
2016-05-27 16:25:10 +10:00
Rob Harrington
bf0db2287b
More structured layout for Tag Rules UI
2016-05-27 16:25:10 +10:00
Rob Harrington
5624fa0c5e
Adding FilterOrderCycles tag rules to UI
2016-05-27 16:25:10 +10:00
Rob Harrington
10434f5ee3
Renaming class
2016-05-27 16:25:10 +10:00
Rob Harrington
e81858c0dc
Renaming PanelToggleRow to PanelCtrl
2016-05-27 16:25:10 +10:00
Rob Harrington
8035b3f24a
Refactoring admin table panels infrastructure
...
Updating enterprise index
2016-05-27 16:25:10 +10:00
Rob Harrington
e999b5715a
Adding FilterPaymentMethods rules to tag rule UI
2016-05-27 16:25:10 +10:00
Rob Harrington
c61cb1bdcd
Renaming paymentMethodCtrl to paymentMethodsCtrl
2016-05-27 16:23:26 +10:00
Rob Harrington
eedb2854ec
Adding FilterProducts rules to tag rule UI
2016-05-27 16:23:26 +10:00
Rob Harrington
b9f6cb8800
Adding translations for all column names
2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Rob Harrington
1d837c32ee
Replacing bindonce with native Angularjs syntax in admin
2016-05-25 08:10:20 +10:00
elf Pavlik
aa04da48f3
fixed i18n on admin edit enterprise
2016-05-22 18:40:42 -05:00
Rob Harrington
d278b72289
Updating Tag Rules UI to allow management of new FilterShippingMethods rule type
2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e
Renaming shippingMethodCtrl to shippingMethodsCtrl
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
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
Maikel Linke
a48b992ec0
Shops can require users to login
...
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.
Closes #849 .
2016-03-18 16:46:28 +11: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
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +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
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
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
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
