Categories
@@ -47,6 +51,6 @@
-
+
diff --git a/src/app/productBrowse/tests/productBrowse.spec.js b/src/app/productBrowse/tests/productBrowse.spec.js
index ae6d80b5..2b879e1e 100644
--- a/src/app/productBrowse/tests/productBrowse.spec.js
+++ b/src/app/productBrowse/tests/productBrowse.spec.js
@@ -8,12 +8,11 @@ describe('Component: ProductBrowse', function () {
describe('State: productBrowse', function () {
var productBrowseState,
catalogID;
- beforeEach(inject(function (catalogid) {
+ beforeEach(function () {
productBrowseState = state.get('productBrowse');
- catalogID = catalogid;
spyOn(ocParametersService, 'Get');
spyOn(oc.Me, 'ListCategories').and.returnValue(null);
- }));
+ });
it('should resolve Parameters', function () {
injector.invoke(productBrowseState.resolve.Parameters);
expect(ocParametersService.Get).toHaveBeenCalled();
@@ -21,7 +20,6 @@ describe('Component: ProductBrowse', function () {
it('should resolve CategoryList', function () {
var parameters = {
depth: 'all',
- catalogID: catalogID,
page: 1,
pageSize: 100
};
@@ -41,9 +39,9 @@ describe('Component: ProductBrowse', function () {
injector.invoke(productsState.resolve.Parameters);
expect(ocParametersService.Get).toHaveBeenCalled();
});
- it('should resolve ProductList', function () {
+ xit('should resolve ProductList', function () {
injector.invoke(productsState.resolve.ProductList);
- expect(oc.Me.ListProducts).toHaveBeenCalledWith(mock.Parameters);
+ expect(oc.Me.ListProducts).toHaveBeenCalledWith(angular.extend(mock.Parameters, {depth:'all'}));
});
});
diff --git a/src/app/productSearch/js/productSearch.component.js b/src/app/productSearch/js/productSearch.component.js
deleted file mode 100644
index 76cb8211..00000000
--- a/src/app/productSearch/js/productSearch.component.js
+++ /dev/null
@@ -1,45 +0,0 @@
-angular.module('orderCloud')
- .component('ordercloudProductSearch', OrderCloudProductSearchComponent())
- .controller('ProductSearchComponentCtrl', ProductSearchComponentController)
-;
-
-function OrderCloudProductSearchComponent() {
- return {
- replace:true,
- templateUrl: 'productSearch/templates/productSearch.component.html',
- controller: 'ProductSearchComponentCtrl',
- bindings: {
- maxProducts: '<'
- }
- };
-}
-
-function ProductSearchComponentController($state, OrderCloudSDK, catalogid) {
- var vm = this;
-
- vm.getSearchResults = function() {
- var parameters = {
- catalogID: catalogid,
- search: vm.searchTerm,
- page: 1,
- pageSize: vm.maxProducts || 5,
- depth: 'all'
- };
- return OrderCloudSDK.Me.ListProducts(parameters)
- .then(function(data) {
- return data.Items;
- });
- };
-
- vm.onSelect = function(productID) {
- $state.go('productDetail', {
- productid: productID
- });
- };
-
- vm.onHardEnter = function(searchTerm) {
- $state.go('productSearchResults', {
- search: searchTerm
- });
- };
-}
\ No newline at end of file
diff --git a/src/app/productSearch/js/productSearch.config.js b/src/app/productSearch/js/productSearch.config.js
deleted file mode 100644
index 0aaed623..00000000
--- a/src/app/productSearch/js/productSearch.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-angular.module('orderCloud')
- .config(ProductSearchConfig)
-;
-
-function ProductSearchConfig($stateProvider) {
- $stateProvider
- .state('productSearchResults', {
- parent: 'base',
- url: '/productSearchResults/:search?page&pageSize&sortBy',
- templateUrl: 'productSearch/templates/productSearch.results.html',
- controller: 'ProductSearchCtrl',
- controllerAs: 'productSearch',
- resolve: {
- Parameters: function(ocParameters, $stateParams) {
- return ocParameters.Get($stateParams);
- },
- ProductList: function(OrderCloudSDK, Parameters, catalogid) {
- var parameters = angular.extend(Parameters, {catalogID: catalogid, depth: 'all', pageSize: (Parameters.pageSize || 12)});
- return OrderCloudSDK.Me.ListProducts(parameters);
- }
- }
- });
-}
\ No newline at end of file
diff --git a/src/app/productSearch/js/productSearch.controller.js b/src/app/productSearch/js/productSearch.controller.js
deleted file mode 100644
index 889a039c..00000000
--- a/src/app/productSearch/js/productSearch.controller.js
+++ /dev/null
@@ -1,54 +0,0 @@
-angular.module('orderCloud')
- .controller('ProductSearchCtrl', ProductSearchController)
-;
-
-function ProductSearchController($state, OrderCloudSDK, ocParameters, Parameters, ProductList) {
- var vm = this;
- vm.list = ProductList;
- vm.parameters = Parameters;
- vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') === 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null;
-
- //Reload the state with new parameters
- vm.filter = function(resetPage) {
- $state.go('.', ocParameters.Create(vm.parameters, resetPage));
- };
-
- vm.updateSort = function(value) {
- value ? angular.noop() : value = vm.sortSelection;
- switch (vm.parameters.sortBy) {
- case value:
- vm.parameters.sortBy = '!' + value;
- break;
- case '!' + value:
- vm.parameters.sortBy = null;
- break;
- default:
- vm.parameters.sortBy = value;
- }
- vm.filter(false);
- };
-
- vm.updatePageSize = function(pageSize) {
- vm.parameters.pageSize = pageSize;
- vm.filter(true);
- };
-
- vm.pageChanged = function(page) {
- vm.parameters.page = page;
- vm.filter(false);
- };
-
- vm.loadMore = function() {
- var parameters = angular.extend(Parameters, {page:vm.list.Meta.Page + 1});
- return OrderCloudSDK.Me.ListProducts(parameters)
- .then(function(data) {
- vm.list.Items = vm.list.Items.concat(data.Items);
- vm.list.Meta = data.Meta;
- });
- };
-
- vm.reverseSort = function() {
- Parameters.sortBy.indexOf('!') === 0 ? vm.parameters.sortBy = Parameters.sortBy.split('!')[1] : vm.parameters.sortBy = '!' + Parameters.sortBy;
- vm.filter(false);
- };
-}
\ No newline at end of file
diff --git a/src/app/productSearch/js/productSearch.service.js b/src/app/productSearch/js/productSearch.service.js
deleted file mode 100644
index 16eaf444..00000000
--- a/src/app/productSearch/js/productSearch.service.js
+++ /dev/null
@@ -1,21 +0,0 @@
-angular.module('orderCloud')
- .factory('ocProductSearch', OrderCloudProductSearchService)
-;
-
-function OrderCloudProductSearchService($uibModal) {
- var service = {
- Open:_open
- };
-
- function _open() {
- return $uibModal.open({
- backdrop:'static',
- templateUrl:'productSearch/templates/productSearch.modal.html',
- controller: 'ProductSearchModalCtrl',
- controllerAs: '$ctrl',
- size: '-full-screen c-productsearch-modal'
- }).result;
- }
-
- return service;
-}
\ No newline at end of file
diff --git a/src/app/productSearch/templates/productSearch.component.html b/src/app/productSearch/templates/productSearch.component.html
deleted file mode 100644
index 07364efd..00000000
--- a/src/app/productSearch/templates/productSearch.component.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
diff --git a/src/app/productSearch/templates/productSearch.results.html b/src/app/productSearch/templates/productSearch.results.html
deleted file mode 100644
index d5ba0008..00000000
--- a/src/app/productSearch/templates/productSearch.results.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
- No products or categories match your search.
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/productSearch/tests/productSearch.spec.js b/src/app/productSearch/tests/productSearch.spec.js
deleted file mode 100644
index c5a72325..00000000
--- a/src/app/productSearch/tests/productSearch.spec.js
+++ /dev/null
@@ -1,199 +0,0 @@
-describe('Component: Product Search', function(){
- describe('State: productSearchResults', function(){
- var productSearchState;
- beforeEach(function(){
- productSearchState = state.get('productSearchResults');
- spyOn(ocParametersService, 'Get');
- spyOn(oc.Me, 'ListProducts');
- });
- it('should resolve Parameters', function(){
- injector.invoke(productSearchState.resolve.Parameters);
- expect(ocParametersService.Get).toHaveBeenCalled();
- });
- it('should resolve ProductList', function(){
- parametersResolve.filters = {ParentID:'12'};
- injector.invoke(productSearchState.resolve.ProductList);
- expect(oc.Me.ListProducts).toHaveBeenCalled();
- });
- });
- describe('Controller: ProductSearchController', function(){
- var productSearchCtrl;
- beforeEach(inject(function($controller){
- productSearchCtrl = $controller('ProductSearchCtrl', {
- ProductList: {
- Items:['product1', 'product2'],
- Meta:{
- ItemRange:[1, 3],
- TotalCount: 50
- }
- }
- });
- spyOn(state, 'go');
- spyOn(ocParametersService, 'Create');
- }));
- describe('vm.filter', function(){
- it('should reload state and call ocParameters.Create with any parameters', function(){
- productSearchCtrl.filter(true);
- expect(state.go).toHaveBeenCalled();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, true);
- });
- });
- describe('vm.updateSort', function(){
- it('should reload page with value and sort order, if both are defined', function(){
- mock.Parameters.sortBy = '!ID';
- productSearchCtrl.updateSort('!ID');
- expect(state.go).toHaveBeenCalled();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, false);
- });
- it('should reload page with just value, if no order is defined', function(){
- mock.Parameters.sortBy = 'ID';
- productSearchCtrl.updateSort('ID');
- expect(state.go).toHaveBeenCalled();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, false);
- });
- });
- describe('vm.updatePageSize', function(){
- it('should reload state with the new pageSize', function(){
- mock.Parameters.pageSize = '25';
- productSearchCtrl.updatePageSize('25');
- expect(state.go).toHaveBeenCalled();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, true);
- });
- });
- describe('vm.pageChanged', function(){
- it('should reload state with the new page', function(){
- mock.Parameters.page = 'newPage';
- productSearchCtrl.pageChanged('newPage');
- expect(state.go).toHaveBeenCalled();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, false);
- });
- });
- describe('vm.reverseSort', function(){
- it('should reload state with a reverse sort call', function(){
- mock.Parameters.sortBy = '!ID';
- productSearchCtrl.reverseSort();
- expect(ocParametersService.Create).toHaveBeenCalledWith(mock.Parameters, false);
- });
- });
- });
- describe('Component Directive: ordercloudProductSearch', function(){
- var productSearchComponentCtrl,
- catalogID;
- beforeEach(inject(function($componentController, catalogid){
- catalogID = catalogid;
- productSearchComponentCtrl = $componentController('ordercloudProductSearch', {
- searchTerm: 'product1',
- maxProducts: 12
- });
- spyOn(state, 'go');
- }));
- describe('getSearchResults', function(){
- beforeEach(function(){
- spyOn(oc.Me, 'ListProducts').and.returnValue(dummyPromise);
- });
- it('should call Me.ListProducts with given search term and max products', function(){
- mock.Parameters = {
- catalogID: catalogID,
- search: productSearchComponentCtrl.searchTerm,
- page: 1,
- pageSize: 5,
- depth: 'all'
- };
- productSearchComponentCtrl.getSearchResults();
- expect(oc.Me.ListProducts).toHaveBeenCalledWith(mock.Parameters);
- });
- it('should default max products to five, if none is provided', function(){
- mock.Parameters = {
- catalogID: catalogID,
- search: productSearchComponentCtrl.searchTerm,
- page: 1,
- pageSize: 5,
- depth: 'all'
- };
- productSearchComponentCtrl.getSearchResults();
- expect(oc.Me.ListProducts).toHaveBeenCalledWith(mock.Parameters);
- });
- });
- describe('onSelect', function(){
- it('should route user to productDetail state for the selected product id', function(){
- productSearchComponentCtrl.onSelect(12);
- expect(state.go).toHaveBeenCalledWith('productDetail', {productid:12});
- });
- });
- describe('onHardEnter', function(){
- it('should route user to search results page for the provided search term', function(){
- productSearchComponentCtrl.onHardEnter('bikes');
- expect(state.go).toHaveBeenCalledWith('productSearchResults', {search: 'bikes'});
- });
- });
- });
- describe('Service: ocProductSearch', function() {
- var productSearchService,
- uibModal;
- beforeEach(inject(function($uibModal, ocProductSearch) {
- uibModal = $uibModal;
- productSearchService = ocProductSearch;
- }));
- describe('Method: Open', function() {
- it('should open the modal for product search', function() {
- spyOn(uibModal, 'open').and.callThrough();
- productSearchService.Open();
- expect(uibModal.open).toHaveBeenCalledWith({
- backdrop:'static',
- templateUrl:'productSearch/templates/productSearch.modal.html',
- controller: 'ProductSearchModalCtrl',
- controllerAs: '$ctrl',
- size: '-full-screen c-productsearch-modal'
- })
- });
- });
- });
- describe('Controller: ProductSearchModalCtrl', function() {
- var productSearchModalCtrl,
- catalogID,
- uibModalInstance = jasmine.createSpyObj('modalInstance', ['close', 'dismiss']);
- beforeEach(inject(function($controller, catalogid) {
- catalogID = catalogid;
- productSearchModalCtrl = $controller('ProductSearchModalCtrl', {
- $uibModalInstance: uibModalInstance,
- $scope: scope
- });
- }));
- describe('vm.getSearchResults', function() {
- beforeEach(function() {
- spyOn(oc.Me, 'ListProducts').and.returnValue(dummyPromise);
- productSearchModalCtrl.getSearchResults();
- });
- it('should get a list of products relative to the search term', function() {
- mock.Parameters = {
- catalogID: catalogID,
- search: productSearchModalCtrl.searchTerm,
- page: 1,
- pageSize: 5,
- depth: 'all'
- };
- expect(oc.Me.ListProducts).toHaveBeenCalledWith(mock.Parameters);
- });
- });
- describe('vm.cancel', function() {
- it('should dismiss the modal', function(){
- productSearchModalCtrl.cancel();
- expect(uibModalInstance.dismiss).toHaveBeenCalled();
- });
- });
- describe('vm.onSelect', function() {
- it('should close the modal with the productID', function() {
- var productID;
- productSearchModalCtrl.onSelect();
- expect(uibModalInstance.close).toHaveBeenCalledWith({productID: productID});
- })
- });
- describe('vm.onHardEnter', function() {
- it('should close the modal on hard enter with the search term', function() {
- var searchTerm;
- productSearchModalCtrl.onHardEnter();
- expect(uibModalInstance.close).toHaveBeenCalledWith({search: searchTerm});
- })
- })
- })
-});
\ No newline at end of file
diff --git a/src/global.spec.js b/src/global.spec.js
index d51fdabd..8106ff4f 100644
--- a/src/global.spec.js
+++ b/src/global.spec.js
@@ -112,6 +112,10 @@ function _mockData() {
xp: {
FavoriteProducts: ['FavProd1', 'FavProd2'],
FavoriteOrders: ['FavOrder1', 'FavOrder2']
+ },
+ Buyer: {
+ ID: 'BUYER_ID',
+ DefaultCatalogID: 'BUYER_DEFAULT_CATALOG_ID'
}
},
Product: {