@@ -38,10 +38,6 @@
-
-
-
-
@@ -63,14 +59,8 @@
-
-
- ![{{item[map.name]}}]()
-
-
- {{_item[field.attribute] | currency}}
+ {{_item[field.attribute] | currency}}
{{_item[field.attribute] | currency}}
diff --git a/src/app/core/directives/ot-table-manager.html b/src/app/core/directives/ot-table-manager.html
index 42753037..af0effd4 100644
--- a/src/app/core/directives/ot-table-manager.html
+++ b/src/app/core/directives/ot-table-manager.html
@@ -41,26 +41,32 @@
-
+
|
|
+
- {{field.label}}
+ {{::field.label}}
|
| |
-
+ |
@@ -84,39 +90,42 @@
|
-
+
|
-
+
|
-
-
+ |
+
- ![]()
+ ![]()
- {{_item[field.attribute] | currency}}
- {{_item[field.attribute] | currency}}
+ {{::_item[field.attribute] | currency}}
+ {{::_item[field.attribute] | currency}}
+ date="::_item[field.attribute]">
- {{_item[field.attribute]}}
+ {{::_item[field.attribute]}}
- {{_item[field.attribute]}}
+ {{::_item[field.attribute]}}
|
diff --git a/src/app/dashboard/css-test.html b/src/app/dashboard/css-test.html
new file mode 100644
index 00000000..4ead6496
--- /dev/null
+++ b/src/app/dashboard/css-test.html
@@ -0,0 +1,1167 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Heading 1
+ Heading 2
+ Heading 3
+ Heading 4
+ Heading 5
+ Heading 6
+ Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.
+
+
+
+
+ Example body text
+ Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.
+ This line of text is meant to be treated as fine print.
+ The following snippet of text is rendered as bold text.
+ The following snippet of text is rendered as italicized text.
+ An abbreviation of the word attribute is attr.
+
+
+
+
+
+ Emphasis classes
+
+ .text-muted
+ Fusce dapibus, tellus ac cursus commodo, tortor mauris nibh.
+
+
+ .text-primary
+ Nullam id dolor id nibh ultricies vehicula ut id elit.
+
+
+ .text-warning
+ Etiam porta sem malesuada magna mollis euismod.
+
+
+ .text-danger
+ Donec ullamcorper nulla non metus auctor fringilla.
+
+
+ .text-success
+ Duis mollis, est non commodo luctus, nisi erat porttitor ligula.
+
+
+ .text-info
+ Maecenas sed diam eget risus varius blandit sit amet non magna.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ Someone famous in Source Title
+
+
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ Someone famous in Source Title
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | # |
+ Column heading |
+ Column heading |
+ Column heading |
+
+
+
+
+ | 1 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 2 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 3 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 4 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 5 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 6 |
+ Column content |
+ Column content |
+ Column content |
+
+
+ | 7 |
+ Column content |
+ Column content |
+ Column content |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tabs
+
+
+
+
+ Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.
+
+
+ Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit.
+
+
+ Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork.
+
+
+ Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alerts
+
+
+
+ h4.alert-warning
+ Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
+
+
+
+
+
+
+
+
+
+ strong.danger a.alert-link and try submitting again.
+
+
+
+
+
+
+
+
+ strong.alert-info This a.alert-link, but it's not super important.
+
+
+
+
+
+
+ Labels
+
+ Default
+ Primary
+ Success
+ Warning
+ Danger
+ Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Basic
+
+
+ Contextual alternatives
+
+
+ Striped
+
+
+ Animated
+
+
+ Stacked
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Jumbotron
+ This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.
+ Learn more
+
+
+
+
+
+
+
+
+
+
+
+ -
+ 14
+ Cras justo odio
+
+ -
+ 2
+ Dapibus ac facilisis in
+
+ -
+ 1
+ Morbi leo risus
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .panel-default
+
+ Panel content
+
+
+
+
+
+ .panel-primary
+
+
+ Panel content
+
+
+
+
+
+ .panel-success
+
+
+ Panel content
+
+
+
+
+
+
+
+
+
+ .panel-warning
+
+
+ Panel content
+
+
+
+
+
+ .panel-danger
+
+
+ Panel content
+
+
+
+
+
+ .panel-info
+
+
+ Panel content
+
+
+
+
+
+
+
+
+
+
+
+ Look, I'm in a well!
+
+
+
+
+
+
+ Look, I'm in a small well!
+
+
+
+
+
+
+ Look, I'm in a large well!
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Popovers
+
+
+
+
+
+
+
+
+
+ Tooltips
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/src/app/dashboard/welcome.html b/src/app/dashboard/welcome.html
index 1915df41..5cf66cec 100644
--- a/src/app/dashboard/welcome.html
+++ b/src/app/dashboard/welcome.html
@@ -13,42 +13,44 @@
Sales
-
-
-
- |
- Total Sales |
- Order Count |
- Sales Avg. |
-
-
-
-
- | Today |
- $ |
- |
- $ |
-
-
- | Yesterday |
- {{salesStats.sales.yesterday | currency}} |
- {{salesStats.orders.yesterday}} |
- {{salesStats.salesAvg.yesterday | currency}} |
-
-
- | Last 7 days |
- {{salesStats.sales.week | currency}} |
- {{salesStats.orders.week}} |
- {{salesStats.salesAvg.week | currency}} |
-
-
- | Month to date |
- {{salesStats.sales.monthToDate | currency}} |
- {{salesStats.orders.monthToDate}} |
- {{salesStats.salesAvg.monthToDate | currency}} |
-
-
-
+
+
+
+
+ |
+ Total Sales |
+ Order Count |
+ Sales Avg. |
+
+
+
+
+ | Today |
+ $ |
+ |
+ $ |
+
+
+ | Yesterday |
+ {{salesStats.sales.yesterday | currency}} |
+ {{salesStats.orders.yesterday}} |
+ {{salesStats.salesAvg.yesterday | currency}} |
+
+
+ | Last 7 days |
+ {{salesStats.sales.week | currency}} |
+ {{salesStats.orders.week}} |
+ {{salesStats.salesAvg.week | currency}} |
+
+
+ | Month to date |
+ {{salesStats.sales.monthToDate | currency}} |
+ {{salesStats.orders.monthToDate}} |
+ {{salesStats.salesAvg.monthToDate | currency}} |
+
+
+
+
@@ -63,37 +65,39 @@ Sales
Visits
-
-
-
- |
- Total Page Views |
- Unique Visitors |
-
-
-
-
- | Today |
- |
- |
-
-
- | Yesterday |
- {{visitStats.total.yesterday}} |
- {{visitStats.unique.yesterday}} |
-
-
- | Last 7 days |
- {{visitStats.total.week}} |
- {{visitStats.unique.week}} |
-
-
- | Month to date |
- {{visitStats.total.monthToDate}} |
- {{visitStats.unique.monthToDate}} |
-
-
-
+
+
+
+
+ |
+ Total Page Views |
+ Unique Visitors |
+
+
+
+
+ | Today |
+ |
+ |
+
+
+ | Yesterday |
+ {{visitStats.total.yesterday}} |
+ {{visitStats.unique.yesterday}} |
+
+
+ | Last 7 days |
+ {{visitStats.total.week}} |
+ {{visitStats.unique.week}} |
+
+
+ | Month to date |
+ {{visitStats.total.monthToDate}} |
+ {{visitStats.unique.monthToDate}} |
+
+
+
+
diff --git a/src/app/design/directives/ot-prettify.js b/src/app/design/directives/ot-prettify.js
new file mode 100644
index 00000000..24843964
--- /dev/null
+++ b/src/app/design/directives/ot-prettify.js
@@ -0,0 +1,23 @@
+angular.module('coreModule')
+
+.directive('otPrettify', [
+ function(){
+ return {
+ require: '?ngModel', // Array = multiple requires, ? = optional, ^ = check parent elements
+ link: function(scope, elem, attr, ngModel) {
+ if (scope.attribute.Type == 'json'){
+
+ ngModel.$formatters.push(function(value){
+ var parsed = {};
+ if (typeof value == 'object' && value != null) { //if it is already parsed json
+ parsed = value; // then its ok
+ } else if (typeof value == 'string') {
+ parsed = JSON.parse(value) // need to parse
+ }
+
+ return JSON.stringify(parsed ,null,' ') // 4 spaces indent
+ })
+ }
+ }
+ };
+}]);
diff --git a/src/app/discounts/list.html b/src/app/discounts/list.html
index aaa19935..fcd81523 100644
--- a/src/app/discounts/list.html
+++ b/src/app/discounts/list.html
@@ -7,33 +7,33 @@
-
-
-
- | Details |
- Total Redemption Limit |
- Begins / Ends |
-
-
-
-
- |
- You don't have any discounts create a discount to get started.
- |
-
-
- |
-
- |
-
- {{ discount.times === -1 ? 'No limit' : discount.times }}
- |
-
- Begins:
- Ends:
- |
-
-
-
-
+
+
+
+
+ | Details |
+ Total Redemption Limit |
+ Begins |
+ Ends |
+
+
+
+
+ |
+ You don't have any discounts create a discount to get started.
+ |
+
+
+ |
+ {{ discount.code }}
+ |
+
+ {{ discount.times === -1 ? 'No limit' : discount.times }}
+ |
+ |
+ |
+
+
+
+
diff --git a/src/app/index.html b/src/app/index.html
index 725d4dd1..e94cecfa 100644
--- a/src/app/index.html
+++ b/src/app/index.html
@@ -26,15 +26,13 @@
-
+
-
-
diff --git a/src/app/login/login.service.js b/src/app/login/login.service.js
index db2c061c..bc298e85 100644
--- a/src/app/login/login.service.js
+++ b/src/app/login/login.service.js
@@ -1,4 +1,4 @@
-angular.module("loginModule")
+angular.module('loginModule')
.service('loginLoginService', [
'$resource',
@@ -10,7 +10,7 @@ angular.module("loginModule")
var login, isAdmin, isLoggedIn, deferIsLoggedIn , mapFields, deferLogOut;
/** Functions */
var init, getLogin, getLoginId, setLogin, cleanLogin, getLoginProperty,
- getFullName, fIsLoggedIn, getDefaultLogin, logout, fillFields;
+ getFullName, fIsLoggedIn, getDefaultLogin, getLoginEmail, logout, fillFields;
isLoggedIn = null;
@@ -151,12 +151,17 @@ angular.module("loginModule")
return isLoggedIn;
};
+ getLoginEmail = function(){
+ return login.email;
+ };
+
return {
init: init,
cleanLogin: cleanLogin,
setLogin: setLogin,
getLogin: getLogin,
- getFullName: getFullName,
+ name: getFullName,
+ email: getLoginEmail,
getLoginId: getLoginId,
isLoggedIn: fIsLoggedIn,
logout: logout
diff --git a/src/app/order/edit.html b/src/app/order/edit.html
index dd14fb9c..2d889f96 100644
--- a/src/app/order/edit.html
+++ b/src/app/order/edit.html
@@ -25,51 +25,53 @@
Order Items
-
-
-
- | Name |
- SKU |
- Options |
- Price |
- Quantity |
- Totals |
-
-
-
-
- | {{product.Name}} |
- {{product.Sku}} |
-
-
- {{ option.label }}: {{ option.value }}
-
- |
- {{product.Price | currency}} |
- {{product.Qty}} |
- {{product.Qty * product.Price | currency}} |
-
-
-
-
- |
-
- Subtotal:
- Shipping:
- Tax:
- Discounts:
- Order Total:
- |
-
- {{order.subtotal | currency}}
- {{order.shipping_amount | currency}}
- {{order.tax_amount | currency}}
- ({{order.discount | currency}})
- {{order.grand_total | currency}}
- |
-
-
-
+
+
+
+
+ | Name |
+ SKU |
+ Options |
+ Price |
+ Quantity |
+ Totals |
+
+
+
+
+ | {{product.Name}} |
+ {{product.Sku}} |
+
+
+ {{ option.label }}: {{ option.value }}
+
+ |
+ {{product.Price | currency}} |
+ {{product.Qty}} |
+ {{product.Qty * product.Price | currency}} |
+
+
+
+
+ |
+
+ Subtotal:
+ Shipping:
+ Tax:
+ Discounts:
+ Order Total:
+ |
+
+ {{order.subtotal | currency}}
+ {{order.shipping_amount | currency}}
+ {{order.tax_amount | currency}}
+ {{order.discount | currency}}
+ {{order.grand_total | currency}}
+ |
+
+
+
+
diff --git a/src/app/order/print.controller.js b/src/app/order/print.controller.js
index 687f62bc..00903a58 100644
--- a/src/app/order/print.controller.js
+++ b/src/app/order/print.controller.js
@@ -10,7 +10,7 @@ angular.module('orderModule')
function($scope, $location, $q, $timeout, orderApiService, cmsApiService) {
$scope.options = {
- showPrice: 0
+ showPrice: showPrice()
};
$scope.orders = [];
@@ -28,35 +28,31 @@ angular.module('orderModule')
function activate() {
var ids = $location.search().ids.split(',');
- fetchOrders(ids);
- fetchCmsHeader();
- showPrice();
+ var o = fetchOrders(ids);
+ var c = fetchCmsHeader();
+ $q.all([o,c]).then(function(){
+ // introduce a delay so angular has time to render before we print
+ $timeout(window.print, 500);
+ });
+
}
// REFACTOR: We should just be making a single request to the server
// http://api.ottemo.io/orders?_id=562125eb30dd91015200003d,5621252c30dd91015200001f
// but right now the response from /orders is different than /order/:id
function fetchOrders(ids) {
- var allPromises = [];
- angular.forEach(ids, function(id) {
- var promise = orderApiService.getOrder({
- 'orderID': id
- }).$promise
- .then(function(resp) {
- $scope.orders.push(resp.result);
- });
-
- allPromises.push(promise);
+ var allPromises = ids.map(function(id) {
+ var params = { 'orderID': id };
+ return orderApiService.getOrder(params).$promise;
});
// Wait for all requests to complete
- $q.all(allPromises)
- .then(function( /*results*/ ) {
+ return $q.all(allPromises).then(function(results) {
+ var orders = results.map(function(resp){
+ return resp.result;
+ });
- // Trigger the print dialog once we've had time to render
- $timeout(function() {
- window.print();
- }, 1000);
+ $scope.orders = orders;
});
}
@@ -71,7 +67,7 @@ angular.module('orderModule')
'extra': 'content',
};
- cmsApiService.blockList(params).$promise
+ return cmsApiService.blockList(params).$promise
.then(function(resp) {
// Normalize response
if (resp.result) {
@@ -98,7 +94,7 @@ angular.module('orderModule')
showPrice = parseInt($location.search().price, 10);
}
- $scope.options.showPrice = showPrice;
+ return showPrice;
}
}
]);
diff --git a/src/app/order/print.html b/src/app/order/print.html
index fb3aec26..4e129b1b 100644
--- a/src/app/order/print.html
+++ b/src/app/order/print.html
@@ -1,5 +1,8 @@
+
+ loading...
+
+ ng-repeat="order in orders track by order._id">
-
diff --git a/src/app/reports/product.html b/src/app/reports/product.html
index 347d87f1..0847e551 100644
--- a/src/app/reports/product.html
+++ b/src/app/reports/product.html
@@ -25,44 +25,46 @@
-
-
-
- | Name |
- Sku |
- Units Sold |
- Gross Sales |
-
-
-
-
- | {{product.name}} |
- {{product.sku}} |
- {{product.units_sold}} |
- {{product.gross_sales | currency}} |
-
-
- |
- No results found for this timeframe.
- |
-
-
-
-
- |
- Totals
- |
-
- |
-
- {{report.total_items}} items in
-
{{report.total_orders}} orders
- |
-
- {{report.total_sales | currency}}
- |
-
-
-
+
+
+
+
+ | Name |
+ Sku |
+ Units Sold |
+ Gross Sales |
+
+
+
+
+ | {{product.name}} |
+ {{product.sku}} |
+ {{product.units_sold}} |
+ {{product.gross_sales | currency}} |
+
+
+ |
+ No results found for this timeframe.
+ |
+
+
+
+
+ |
+ Totals
+ |
+
+ |
+
+ {{report.total_items}} items in
+
{{report.total_orders}} orders
+ |
+
+ {{report.total_sales | currency}}
+ |
+
+
+
+
diff --git a/src/app/seo/edit.html b/src/app/seo/edit.html
index 2f89d1bb..beab795a 100644
--- a/src/app/seo/edit.html
+++ b/src/app/seo/edit.html
@@ -9,11 +9,8 @@
-
+
+
-
-
-
-
-
-
+
+
diff --git a/src/app/subscriptions/edit.html b/src/app/subscriptions/edit.html
index 3f81479a..3c603d7e 100644
--- a/src/app/subscriptions/edit.html
+++ b/src/app/subscriptions/edit.html
@@ -15,51 +15,53 @@
Order Items
-
-
-
- | Name |
- SKU |
- Options |
- Price |
- Quantity |
- Totals |
-
-
-
-
- | {{ product.name }} |
- {{ product.sku }} |
-
-
- {{ label }}: {{ value }}
-
- |
- {{ product.price | currency }} |
- {{ product.qty }} |
- {{ product.qty * product.price | currency }} |
-
-
-
-
+
+
+
+
+ | Name |
+ SKU |
+ Options |
+ Price |
+ Quantity |
+ Totals |
+
+
+
+
+ | {{ product.name }} |
+ {{ product.sku }} |
+
+
+ {{ label }}: {{ value }}
+
+ |
+ {{ product.price | currency }} |
+ {{ product.qty }} |
+ {{ product.qty * product.price | currency }} |
+
+
+
+
+
diff --git a/src/app/visitor/attribute/edit.html b/src/app/visitor/attribute/edit.html
index 89c0061a..3f230466 100644
--- a/src/app/visitor/attribute/edit.html
+++ b/src/app/visitor/attribute/edit.html
@@ -13,9 +13,7 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/visitor/edit.html b/src/app/visitor/edit.html
index b9d82b67..5c94e248 100644
--- a/src/app/visitor/edit.html
+++ b/src/app/visitor/edit.html
@@ -26,63 +26,61 @@
ng-click="addressForm()">Addresses
+
+
No orders to report
-
-
-
- | Order Date |
- ID |
- Notes |
- Total |
- Status |
- Actions |
-
-
-
-
- |
- {{ order.Extra._id }} |
-
-
-
- {{ note }}
+
+
+
+
+ | Order Date |
+ ID |
+ Notes |
+ Total |
+ Status |
+
+
+
+
+ |
+ {{ order.ID }} |
+
+
-
- |
- {{ order.Extra.grand_total | currency }} |
- {{ order.Extra.status }} |
-
- View Order
- |
-
-
-
+ |
+ {{ order.Extra.grand_total | currency }} |
+ {{ order.Extra.status }} |
+
+
+
+
No subscriptions to report
-
-
-
- | Order Date |
- ID |
- Status |
- Actions |
-
-
-
-
- |
- {{ subscription.Extra._id }} |
- {{ subscription.Extra.status }} |
-
- View Subscription
- |
-
-
-
+
diff --git a/src/app/visitor/email.html b/src/app/visitor/email.html
index a1cf4897..17461b8a 100644
--- a/src/app/visitor/email.html
+++ b/src/app/visitor/email.html
@@ -5,15 +5,13 @@
-
+
-
-
-
- Send
-
\ No newline at end of file
+
+
+ Send
\ No newline at end of file
|