From a9086fdd998effc6c73eabf4378bb6ca458fc909 Mon Sep 17 00:00:00 2001 From: Ian Wendt Date: Thu, 17 Mar 2016 09:26:30 -0700 Subject: [PATCH 01/16] Close GH-258: [#115868757] Updated the api url in demo-prod config. --- config/demo-prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/demo-prod.json b/config/demo-prod.json index ffa1169e..f9789f1e 100644 --- a/config/demo-prod.json +++ b/config/demo-prod.json @@ -1,6 +1,6 @@ { "useStrict" : "use strict", - "apiUrl" : "https://api.demo.ottemo.io", + "apiUrl" : "https://api-demo.ottemo.io", "mediaPath" : "https://demo.ottemo.io/media/", "itemsPerPage" : "15" } \ No newline at end of file From 9e8fc7374c4df91c422512f0b722b7699b1fd157 Mon Sep 17 00:00:00 2001 From: Ian Wendt Date: Thu, 17 Mar 2016 09:58:27 -0700 Subject: [PATCH 02/16] Close GH-259: [#115874479] Updated shippable.yml and deploy.sh. --- deploy.sh | 2 +- shippable.yml | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/deploy.sh b/deploy.sh index bfeb36c4..2c056379 100644 --- a/deploy.sh +++ b/deploy.sh @@ -26,7 +26,7 @@ if [ "$BRANCH" == 'develop' ]; then HOST=mp-staging fi # gulp build on remote host - ssh ottemo@$REMOTE_HOST "cd $SRCDIR && npm install && gulp build --api=${HOST}" + ssh ottemo@$REMOTE_HOST "cd $SRCDIR && npm install && gulp build --env=staging --api=${HOST}" echo "" echo RESTORING DIST DIRECTORY. diff --git a/shippable.yml b/shippable.yml index 7fbca20e..a54f28fc 100644 --- a/shippable.yml +++ b/shippable.yml @@ -1,15 +1,17 @@ language: node_js node_js: - - 0.12 + - 5.4.0 + +cache: false -# build image -build_image: shippableimages/ubuntu1404_nodejs env: global: - SLACK_ORG=Ottemo PROJECT=Dashboard - secure: B+KCUkySYJbPkFEcsuhCiaYymVphNX6aOkB7yjLYVlwLyZ0AmPv6a3BKOhFZyy15te+4nEQV4bY4Q/n40ceFMEj5FDlXXOw+oP4DMBd2/GS8HUkH8PnOKplH3hOYnob91Kr6tpuDOHJ1gfukAqQSIkQkgJGCwDx6uzYDfOSgxDUTAgp8GqdXnl6arvZzpmuFic5IScWSU0G6novNVdMD21z1KPpgxckurtStOxHWgOc+N0QSQXzE3MpsIyCxhJNVSxizxKoXLaZ7uktAkPmsloyUPfIYj9zni+n7OgxHlrnUl4DJPQmN89TndP2NeQa7nlUgPfhq5N6Hxxx3M6INDw== +install: + # only build/deploy the develop branch branch: only: @@ -26,4 +28,4 @@ after_success: - python slack_notifier.py --org $SLACK_ORG --project $PROJECT --token $SLACK_TOKEN -s notifications: - email: false + email: false \ No newline at end of file From 56f17dded2646c13b7bfcd0839096445c0f1a51b Mon Sep 17 00:00:00 2001 From: Adam Knox Date: Mon, 21 Mar 2016 09:29:53 -0700 Subject: [PATCH 03/16] Close GH-257: order status tabs [#115525249]. --- src/app/_scripts/main.js | 5 - src/app/_styles/_bootswatch.scss | 2 + src/app/_styles/components.scss | 3 +- src/app/_styles/components/spacing.scss | 2 +- src/app/_styles/components/tables.scss | 14 +- src/app/_styles/components/tabs.scss | 4 + src/app/design/directives/filter/guiRange.js | 76 ++--- src/app/design/directives/filter/guiSelect.js | 2 +- src/app/design/directives/guiTableManager.js | 8 +- src/app/design/directives/otEnter.js | 16 + src/app/design/gui/filter/dateRange.html | 28 +- src/app/design/gui/filter/range.html | 28 +- src/app/design/gui/filter/select.html | 13 +- src/app/design/gui/filter/text.html | 10 +- src/app/design/gui/table.html | 41 ++- src/app/order/list.controller.js | 310 +++++++++--------- src/app/order/list.html | 114 ++++--- src/app/order/order.scss | 5 + 18 files changed, 369 insertions(+), 312 deletions(-) create mode 100644 src/app/_styles/components/tabs.scss create mode 100644 src/app/design/directives/otEnter.js diff --git a/src/app/_scripts/main.js b/src/app/_scripts/main.js index eb0f06f7..c1d9b2bb 100644 --- a/src/app/_scripts/main.js +++ b/src/app/_scripts/main.js @@ -8,11 +8,6 @@ $(document).ready(function () { $(this).tab('show'); }); - // show/hide filters - $(document).on('click', '.filters', function () { - $('#filters').toggle(0); - }); - // uploading files $(document).on('click', '.upl-btn', function () { $(this).prev('.upl-input').trigger('click'); diff --git a/src/app/_styles/_bootswatch.scss b/src/app/_styles/_bootswatch.scss index 878be385..cb9602eb 100644 --- a/src/app/_styles/_bootswatch.scss +++ b/src/app/_styles/_bootswatch.scss @@ -79,6 +79,8 @@ input, background-color: $gray-lighter; border-color: $nav-tabs-border-color; color: $gray; + height: 42px; + line-height: 2; } > li.disabled > a:hover { diff --git a/src/app/_styles/components.scss b/src/app/_styles/components.scss index 8a00cba5..53dfb8ce 100644 --- a/src/app/_styles/components.scss +++ b/src/app/_styles/components.scss @@ -5,4 +5,5 @@ @import 'components/navigation'; @import 'components/odometer'; @import 'components/spacing'; -@import 'components/tables'; \ No newline at end of file +@import 'components/tables'; +@import 'components/tabs'; \ No newline at end of file diff --git a/src/app/_styles/components/spacing.scss b/src/app/_styles/components/spacing.scss index 0cfc221d..b1b63c8a 100644 --- a/src/app/_styles/components/spacing.scss +++ b/src/app/_styles/components/spacing.scss @@ -1,6 +1,6 @@ // bootstrap 4 spacing helpers -$spacer: $grid-gutter-width; +$spacer: $grid-gutter-width / 2; $spacer-x: $spacer; $spacer-y: $spacer; diff --git a/src/app/_styles/components/tables.scss b/src/app/_styles/components/tables.scss index 7a0500f9..0267d516 100644 --- a/src/app/_styles/components/tables.scss +++ b/src/app/_styles/components/tables.scss @@ -1,9 +1,13 @@ .table .td__title { - margin-top: 0; + margin-top: 0; } .table-striped-even { - > tbody > tr:nth-of-type(even) { - background-color: $table-bg-accent; - } -} \ No newline at end of file + > tbody > tr:nth-of-type(even) { + background-color: $table-bg-accent; + } +} + +.th-clickable { + cursor: pointer; +} diff --git a/src/app/_styles/components/tabs.scss b/src/app/_styles/components/tabs.scss new file mode 100644 index 00000000..67c4e3b8 --- /dev/null +++ b/src/app/_styles/components/tabs.scss @@ -0,0 +1,4 @@ +.tab-content-empty { + margin-top: 15px; + text-align: center; +} \ No newline at end of file diff --git a/src/app/design/directives/filter/guiRange.js b/src/app/design/directives/filter/guiRange.js index 24bac6a1..d2ee458d 100644 --- a/src/app/design/directives/filter/guiRange.js +++ b/src/app/design/directives/filter/guiRange.js @@ -1,71 +1,49 @@ -angular.module("designModule") +angular.module('designModule') -.directive("guiFilterRange", ["$designService", function($designService) { +.directive('guiFilterRange', ['$designService', function($designService) { return { - restrict: "E", + restrict: 'E', scope: { - "parent": "=object", - "attribute": "=editorScope", - "item": "=item" + 'parent': '=object', + 'attribute': '=editorScope', + 'item': '=item' }, - templateUrl: $designService.getTemplate("design/gui/filter/range.html"), + templateUrl: '/views/design/gui/filter/range.html', - controller: ["$scope", function($scope) { + controller: ['$scope', function($scope) { - $scope.highInvalid = false; - $scope.lowInvalid = false; - $scope.low = ""; - $scope.high = ""; - var regExpNumber = /^\s*[0-9]*\s*$/; + // $scope.low = ''; + // $scope.high = ''; var isInit = false; - var checkOnValid = function() { - - if (!regExpNumber.test($scope.low)) { - $scope.lowInvalid = true; - } else { - $scope.lowInvalid = false; - } - - if (!regExpNumber.test($scope.high)) { - $scope.highInvalid = true; - } else { - $scope.highInvalid = false; - } - }; - $scope.submit = function() { var targetAttribute = $scope.attribute.Attribute; - checkOnValid(); - - if (!$scope.lowInvalid && !$scope.highInvalid) { - var newFilterValue = ''; - $scope.low = $scope.low.trim(); - $scope.high = $scope.high.trim(); - - if ($scope.low || $scope.high) { - newFilterValue = $scope.low + ".." + $scope.high; - } - - $scope.item[targetAttribute] = newFilterValue - $scope.parent.newFilters[targetAttribute] = $scope.item[targetAttribute]; + var newFilterValue = ''; + + if ($scope.low || $scope.high) { + newFilterValue = [ + $scope.low, + '..', + $scope.high + ].join(''); } + + $scope.item[targetAttribute] = newFilterValue; + $scope.parent.newFilters[targetAttribute] = $scope.item[targetAttribute]; }; - $scope.$watch("item", function() { - if (typeof $scope.item === "undefined") { + $scope.$watch('item', function() { + if (typeof $scope.item === 'undefined') { return false; } - if (isInit || typeof $scope.item[$scope.attribute.Attribute] === "undefined") { + if (isInit || typeof $scope.item[$scope.attribute.Attribute] === 'undefined') { return false; } - var value = $scope.item[$scope.attribute.Attribute]; - var regExp = new RegExp("(\\d*)\\.\\.(\\d*)$", "i"); - var values = value.match(regExp); + var values = $scope.item[$scope.attribute.Attribute].split('..'); if (null !== values) { - $scope.low = values[1]; - $scope.high = values[2]; + $scope.low = parseFloat(values[0]); + $scope.high = parseFloat(values[1]); isInit = true; } diff --git a/src/app/design/directives/filter/guiSelect.js b/src/app/design/directives/filter/guiSelect.js index 6523b4f3..3a571af4 100644 --- a/src/app/design/directives/filter/guiSelect.js +++ b/src/app/design/directives/filter/guiSelect.js @@ -58,7 +58,7 @@ angular.module("designModule") var options, field, setNewFilterValues; setNewFilterValues = function () { - if (-1 !== ['text', 'string'].indexOf($scope.item.dataType)) { + if (-1 !== ['text', 'string', 'varchar'].indexOf($scope.item.dataType)) { $scope.item[$scope.attribute.Attribute] = $scope.item[$scope.attribute.Attribute].replace(/~/g, ""); $scope.parent.newFilters[$scope.attribute.Attribute] = $scope.item[$scope.attribute.Attribute].replace(/~/g, "").split(" "); } else { diff --git a/src/app/design/directives/guiTableManager.js b/src/app/design/directives/guiTableManager.js index 138514bd..1d7d3062 100644 --- a/src/app/design/directives/guiTableManager.js +++ b/src/app/design/directives/guiTableManager.js @@ -64,7 +64,8 @@ angular.module("designModule") // name: isActive new: true, delete: true - } + }; + $scope.isFiltersVisible = false; // If we have any buttonData set on the directive, let it override our defaults angular.forEach($scope.buttonData, function(isActive, btnName) { @@ -368,7 +369,10 @@ angular.module("designModule") if (filters[key] instanceof Array) { removeEmpty(filters[key]); if (filters[key].length > 0) { - filtersArr.push(key.toLowerCase() + '=~' + filters[key].join()); + // I'm not sure why we are using the like comparison operator + // for everything, but we don't want it for order.status... + var op = (key === 'status') ? '=' : '=~' + filtersArr.push(key.toLowerCase() + op + filters[key].join()); } } else { filtersArr.push(key.toLowerCase() + '=' + filters[key]); diff --git a/src/app/design/directives/otEnter.js b/src/app/design/directives/otEnter.js new file mode 100644 index 00000000..6cfcd9b4 --- /dev/null +++ b/src/app/design/directives/otEnter.js @@ -0,0 +1,16 @@ +angular.module('designModule') + +.directive('otEnter', function() { + return function(scope, element, attrs) { + element.bind('keydown keypress', function(event) { + if (event.which === 13) { + scope.$apply(function() { + scope.$eval(attrs.otEnter); + }); + + event.preventDefault(); + } + }); + }; +}); + diff --git a/src/app/design/gui/filter/dateRange.html b/src/app/design/gui/filter/dateRange.html index e775d19d..b22d9008 100644 --- a/src/app/design/gui/filter/dateRange.html +++ b/src/app/design/gui/filter/dateRange.html @@ -1,16 +1,20 @@ -
- -
- -

Invalid format. Select correct date.

+
+
+
- -
- -

Invalid format. Select correct date.

+ +
+
- apply + +

Invalid format. Select correct date.

+ + apply
diff --git a/src/app/design/gui/filter/range.html b/src/app/design/gui/filter/range.html index f1650d92..97c37a3f 100644 --- a/src/app/design/gui/filter/range.html +++ b/src/app/design/gui/filter/range.html @@ -1,18 +1,22 @@ -
- -
- -

Invalid format. Only numbers.

+
+
+
- -
- -

Invalid format. Only numbers.

+
+
- Apply +

Invalid format. Only numbers.

+ + Apply
diff --git a/src/app/design/gui/filter/select.html b/src/app/design/gui/filter/select.html index 596948f9..2f6c4ba2 100644 --- a/src/app/design/gui/filter/select.html +++ b/src/app/design/gui/filter/select.html @@ -1,5 +1,8 @@ - \ No newline at end of file + + diff --git a/src/app/design/gui/filter/text.html b/src/app/design/gui/filter/text.html index 90f79570..65c1d57d 100644 --- a/src/app/design/gui/filter/text.html +++ b/src/app/design/gui/filter/text.html @@ -1,3 +1,7 @@ - \ No newline at end of file + + diff --git a/src/app/design/gui/table.html b/src/app/design/gui/table.html index 89932eb1..c46410f9 100644 --- a/src/app/design/gui/table.html +++ b/src/app/design/gui/table.html @@ -1,51 +1,56 @@
-
+
-
- -
-
+
- +
- - -
- -
-
+ +
- +
- - - - + + diff --git a/src/app/order/list.controller.js b/src/app/order/list.controller.js index 8b6a4436..2939df2b 100644 --- a/src/app/order/list.controller.js +++ b/src/app/order/list.controller.js @@ -1,173 +1,165 @@ -angular.module("orderModule") - -.controller("orderListController", [ -"$rootScope", -"$scope", -"$location", -"$routeParams", -"$q", -"$dashboardListService", -"$orderApiService", -"COUNT_ITEMS_PER_PAGE", -function ($rootScope, $scope, $location, $routeParams, $q, DashboardListService, $orderApiService, COUNT_ITEMS_PER_PAGE) { - var getOrdersList, serviceList, getOrderCount, getAttributeList, showColumns; - serviceList = new DashboardListService(); - showColumns = { - _id : {type: 'select-link', label : 'Order ID', filter: 'text'}, - status : {}, - customer_email : {}, - customer_name : {}, - grand_total : {label : 'Total', filter : 'range', type : 'price'}, - created_at : {label : 'Date', type : 'date'} - }; - - // REFACTOR: I only want to work with the selected ids - // instead of an object of ids where the value was the selected state - $scope.selectedIds = []; - $scope.idsSelectedRows = {}; - $scope.$watch('idsSelectedRows', function(newVal, oldVal){ - var ids = []; - angular.forEach($scope.idsSelectedRows, function(active, id) { - if (active) { - ids.push(id); +angular.module('orderModule') + +.controller('orderListController', [ + '$scope', + '$location', + '$dashboardListService', + '$orderApiService', + function( + $scope, + $location, + DashboardListService, + $orderApiService + ) { + + var serviceList = new DashboardListService(); + var showColumns = { + _id: { + type: 'select-link', + label: 'Order ID', + filter: 'text' + }, + status: {}, + customer_email: {}, + customer_name: {}, + grand_total: { + label: 'Total', + filter: 'range', + type: 'price' + }, + created_at: { + label: 'Date', + type: 'date' } - }); - $scope.selectedIds = ids; - }, true); - - /** - * Gets list of orders - */ - getOrdersList = function () { - var params = $location.search(); - params["extra"] = serviceList.getExtraFields(); - - $orderApiService.orderList(params).$promise.then( - function (response) { - var result = response.result || []; - $scope.orders = serviceList.getList(result) - } - ); - }; - - getOrderCount = function() { - $orderApiService.getCount($location.search(), {}).$promise.then( - function (response) { - if (response.error === null) { - $scope.count = response.result; - } else { - $scope.count = 0; - } - } - ); - }; - - getAttributeList = function() { - $orderApiService.getAttributes().$promise.then( - function (response) { - var result = response.result || []; - serviceList.init('orders'); - $scope.attributes = result; - serviceList.setAttributes($scope.attributes); - $scope.fields = serviceList.getFields(showColumns); - getOrdersList(); + }; + + var searchDefaults = { + status: 'pending,new', + sort: '^created_at', + limit: '0,50', + }; + + // REFACTOR: I only want to work with the selected ids + // instead of an object of ids where the value was the selected state + $scope.selectedIds = []; + $scope.idsSelectedRows = {}; + + $scope.actions = { + isOpen: false, + export: angular.appConfigValue('general.app.foundation_url') + '/export/quickbooks', + printUrl: printUrl, + packingSlipUrl: packingSlipUrl, + }; + + $scope.tabs = { + isActive: isTabActive, + setStatus: setStatusFilter, + processedCount: 0, + }; + + $scope.select = select; + $scope.create = create; + + activate(); + + /////////////////////////////////////// + + function activate() { + $scope.$watch('idsSelectedRows', function(newVal, oldVal) { + var ids = []; + angular.forEach($scope.idsSelectedRows, function(active, id) { + if (active) { + ids.push(id); + } + }); + $scope.selectedIds = ids; + }, true); + + setSearchDefaults(); + + getOrderCount(); + getAttributeList(); + getProcessedOrderCount(); + } + + function setSearchDefaults() { + if (JSON.stringify({}) === JSON.stringify($location.search())) { + $location.search(searchDefaults).replace(); } - ); - }; - - /** - * Handler event when selecting the order in the list - * - * @param id - */ - $scope.select = function (id) { - $location.path("/orders/" + id).search(''); - }; - - /** - * - */ - $scope.create = function () { - $location.path("/orders/new"); - }; - - var hasSelectedRows = function () { - return $scope.selectedIds.length; - }; - - - $scope.actions = { - isOpen: false, - export: angular.appConfigValue('general.app.foundation_url') +'/export/quickbooks' - }; - - $scope.actions.printUrl = function() { - return '/orders/print?ids=' + $scope.selectedIds.join(','); - } + } - $scope.actions.packingSlipUrl = function() { - return '/orders/print?price=0&ids=' + $scope.selectedIds.join(','); - } + function getOrdersList() { + var params = $location.search(); + params.extra = serviceList.getExtraFields(); - /** - * Removes order by ID - * - */ - $scope.remove = function () { - if (!hasSelectedRows()) { - return true; + $orderApiService.orderList(params).$promise + .then(function(response) { + var result = response.result || []; + $scope.orders = serviceList.getList(result); + }); } - var i, answer, _remove; - answer = window.confirm("You really want to remove this order(s)?"); - _remove = function (id) { - var defer = $q.defer(); - - $orderApiService.remove({"orderID": id}, - function (response) { - if (response.result === "ok") { - defer.resolve(id); - } else { - defer.resolve(false); - } + function getProcessedOrderCount() { + var params = {}; + angular.copy(searchDefaults, params); + params.status = 'processed'; + + $orderApiService.getCount(params).$promise + .then(function(response) { + $scope.tabs.processedCount = response.result || 0; + }); + } + + function getOrderCount() { + $orderApiService.getCount($location.search()).$promise + .then(function(response) { + $scope.count = (response.error === null) ? response.result : 0; + }); + } + + function getAttributeList() { + $orderApiService.getAttributes().$promise.then( + function(response) { + var result = response.result || []; + serviceList.init('orders'); + $scope.attributes = result; + serviceList.setAttributes($scope.attributes); + $scope.fields = serviceList.getFields(showColumns); + getOrdersList(); } ); + } - return defer.promise; - }; - if (answer) { - $('[ng-click="parent.remove()"]').addClass('disabled').append('
+ {{field.label}}
  +
 
@@ -65,7 +70,7 @@
 
- +
Today $
Yesterday
Today
Yesterday
NameSkuUnits SoldGross 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}} +