+
\ No newline at end of file
diff --git a/src/app/myAddresses/templates/myAddresses.edit.modal.tpl.html b/src/app/myAddresses/templates/myAddresses.edit.modal.tpl.html
new file mode 100644
index 00000000..d9795b6b
--- /dev/null
+++ b/src/app/myAddresses/templates/myAddresses.edit.modal.tpl.html
@@ -0,0 +1,69 @@
+
\ No newline at end of file
diff --git a/src/app/myAddresses/templates/myAddresses.tpl.html b/src/app/myAddresses/templates/myAddresses.tpl.html
new file mode 100644
index 00000000..ec17180d
--- /dev/null
+++ b/src/app/myAddresses/templates/myAddresses.tpl.html
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/src/app/myAddresses/tests/myAddresses.modalFactory.spec.js b/src/app/myAddresses/tests/myAddresses.modalFactory.spec.js
new file mode 100644
index 00000000..094b3107
--- /dev/null
+++ b/src/app/myAddresses/tests/myAddresses.modalFactory.spec.js
@@ -0,0 +1,120 @@
+describe('Component: myAddresses', function() {
+ var scope,
+ q,
+ oc,
+ uibModalInstance
+ beforeEach(module('orderCloud'));
+ beforeEach(module('orderCloud.sdk'));
+ beforeEach(inject(function($rootScope, $q, OrderCloud) {
+ scope = $rootScope.$new();
+ q = $q;
+ oc = OrderCloud;
+ }));
+ describe('Factory: MyAddressesModal', function() {
+ var uibModal,
+ addressModal,
+ createModalOptions,
+ editModalOptions,
+ actualOptions;
+ beforeEach(inject(function($uibModal, MyAddressesModal) {
+ uibModal = $uibModal;
+ addressModal = MyAddressesModal;
+ uibModalInstance = jasmine.createSpyObj('modalInstance', ['close', 'dismiss', 'result.then']);
+ createModalOptions = {
+ templateUrl: 'myAddresses/templates/myAddresses.create.modal.tpl.html',
+ controller: 'CreateAddressModalCtrl',
+ controllerAs: 'createAddress',
+ size: 'md'
+ };
+ editModalOptions = {
+ templateUrl: 'myAddresses/templates/myAddresses.edit.modal.tpl.html',
+ controller: 'EditAddressModalCtrl',
+ controllerAs: 'editAddress',
+ size: 'md',
+ resolve: {
+ //we dont care what gets returned here because functions can't be
+ //compared anyway. We do however mock a function that captures the options
+ //passed in and verify they are the same, in the test.
+ SelectedAddress: jasmine.any(Function)
+ }
+ };
+ }));
+ describe('Create', function() {
+ it('should call $uibModal open with create modal template/controller', function() {
+ spyOn(uibModal, 'open').and.returnValue(uibModalInstance);
+ addressModal.Create();
+ expect(uibModal.open).toHaveBeenCalledWith(createModalOptions);
+ });
+ });
+ describe('Edit', function() {
+ it('should call $uibModal with edit modal template/controller', function() {
+ spyOn(uibModal, 'open').and.callFake(function(options) {
+ actualOptions = options;
+ return uibModalInstance;
+ });
+ addressModal.Edit('addressToEdit');
+ expect(uibModal.open).toHaveBeenCalledWith(editModalOptions);
+ expect(actualOptions.resolve.SelectedAddress()).toEqual('addressToEdit');
+ });
+ });
+ });
+ describe('Controller: CreateAddressModalController', function(){
+ var createAddressModalCtrl
+ ;
+ beforeEach(inject(function($controller, $exceptionHandler, ocGeography){
+ createAddressModalCtrl = $controller('CreateAddressModalCtrl', {
+ $exceptionHandler: $exceptionHandler,
+ $uibModalInstance: uibModalInstance,
+ ocGeography: ocGeography
+ });
+ var defer = q.defer();
+ defer.resolve('newAddress');
+ spyOn(oc.Me, 'CreateAddress').and.returnValue(defer.promise);
+ }));
+ describe('cancel', function(){
+ it('should dismiss the modal', function(){
+ createAddressModalCtrl.cancel();
+ expect(uibModalInstance.dismiss).toHaveBeenCalled();
+ });
+ });
+ describe('submit', function(){
+ it('should call OrderCloud.Me Create Address', function(){
+ createAddressModalCtrl.submit();
+ expect(oc.Me.CreateAddress).toHaveBeenCalledWith({Country:'US', Shipping: true, Billing: true});
+ scope.$digest();
+ expect(uibModalInstance.close).toHaveBeenCalledWith('newAddress');
+ });
+ });
+ });
+ describe('Controller: EditAddressModalCtrl', function(){
+ var editAddressModalCtrl,
+ mockAddressResolve
+ ;
+ beforeEach(inject(function($controller, $exceptionHandler, ocGeography){
+ mockAddressResolve = {name:'mockAddress', ID:'1'}
+ editAddressModalCtrl = $controller('EditAddressModalCtrl', {
+ $exceptionHandler: $exceptionHandler,
+ $uibModalInstance: uibModalInstance,
+ ocGeography: ocGeography,
+ SelectedAddress: mockAddressResolve
+ });
+ var defer = q.defer();
+ defer.resolve('newAddress');
+ spyOn(oc.Me, 'UpdateAddress').and.returnValue(defer.promise);
+ }));
+ describe('cancel', function(){
+ it('should dismiss the modal', function(){
+ editAddressModalCtrl.cancel();
+ expect(uibModalInstance.dismiss).toHaveBeenCalled();
+ });
+ });
+ describe('submit', function(){
+ it('should call OrderCloud.Me Update Address', function(){
+ editAddressModalCtrl.submit();
+ expect(oc.Me.UpdateAddress).toHaveBeenCalledWith('1', {name:'mockAddress', ID:'1', Shipping: true, Billing: true});
+ scope.$digest();
+ expect(uibModalInstance.close).toHaveBeenCalledWith('newAddress');
+ });
+ });
+ });
+});
\ No newline at end of file
diff --git a/src/app/myAddresses/tests/myAddresses.spec.js b/src/app/myAddresses/tests/myAddresses.spec.js
new file mode 100644
index 00000000..172a5449
--- /dev/null
+++ b/src/app/myAddresses/tests/myAddresses.spec.js
@@ -0,0 +1,101 @@
+describe('Component: myAddresses', function(){
+ var scope,
+ q,
+ oc,
+ state
+ ;
+ beforeEach(module('orderCloud'));
+ beforeEach(module('orderCloud.sdk'));
+ beforeEach(inject(function($rootScope, $q, OrderCloud, $state){
+ scope = $rootScope.$new();
+ q = $q;
+ oc = OrderCloud;
+ state = $state;
+ }));
+
+ describe('State: myAddresses', function(){
+ beforeEach(inject(function($state){
+ state = $state.get('myAddresses');
+ spyOn(oc.Me, 'ListAddresses');
+ }));
+ it('should resolve AddressList', inject(function($injector){
+ $injector.invoke(state.resolve.AddressList);
+ expect(oc.Me.ListAddresses).toHaveBeenCalledWith(null, null, null, null, null, {Editable:true});
+ }));
+ });
+
+ describe('Controller: MyAddressesCtrl', function(){
+ var myAddressesCtrl,
+ state,
+ toaster,
+ confirm,
+ addressModal,
+ mockAddress,
+ mockAddressList
+ ;
+ beforeEach(inject(function($state, toastr, ocConfirm, MyAddressesModal, $controller){
+ state = $state;
+ toaster = toastr;
+ confirm = ocConfirm;
+ addressModal = MyAddressesModal;
+ mockAddress = {ID:"MOCK_ADDRESS_ID"};
+ mockAddressList = {Items:[mockAddress]};
+ myAddressesCtrl = $controller('MyAddressesCtrl', {
+ $scope: scope,
+ $state: state,
+ toastr: toaster,
+ AddressList: mockAddressList
+ });
+ spyOn(state, 'reload');
+ spyOn(toaster, 'success');
+ }));
+ it ('Should initialize the view model with the address list', function() {
+ expect(myAddressesCtrl.list).toEqual(mockAddressList);
+ });
+ describe('create', function(){
+ beforeEach(function(){
+ var defer = q.defer();
+ defer.resolve("NEW_ADDRESS");
+ spyOn(addressModal, 'Create').and.returnValue(defer.promise);
+ myAddressesCtrl.create();
+ });
+ it('should call the create address modal then reload the state and display success toastr', function(){
+ expect(addressModal.Create).toHaveBeenCalled();
+ scope.$digest();
+ expect(toaster.success).toHaveBeenCalledWith('Address Created', 'Success');
+ expect(myAddressesCtrl.list).toEqual({Items:[mockAddress, "NEW_ADDRESS"]});
+
+ });
+ });
+ describe('edit', function(){
+ beforeEach(function(){
+ var defer = q.defer();
+ defer.resolve("EDITED_ADDRESS");
+ spyOn(addressModal, 'Edit').and.returnValue(defer.promise);
+ myAddressesCtrl.edit({$index:0, address:mockAddress});
+ });
+ it('should call the edit address modal, then reload the state and display success toastr', function(){
+ expect(addressModal.Edit).toHaveBeenCalledWith(mockAddress);
+ scope.$digest();
+ expect(toaster.success).toHaveBeenCalledWith('Address Saved', 'Success');
+ expect(myAddressesCtrl.list).toEqual({Items:["EDITED_ADDRESS"]});
+ });
+ });
+ describe('delete', function(){
+ beforeEach(function(){
+ var defer = q.defer();
+ defer.resolve();
+ spyOn(confirm, 'Confirm').and.returnValue(defer.promise);
+ spyOn(oc.Me, 'DeleteAddress').and.returnValue(defer.promise);
+ myAddressesCtrl.delete({$index:0, address:mockAddress});
+ });
+ it('should delete address, after prompting user to confirm', function(){
+ expect(confirm.Confirm).toHaveBeenCalledWith('Are you sure you want to delete this address?');
+ scope.$digest();
+ expect(oc.Me.DeleteAddress).toHaveBeenCalledWith('MOCK_ADDRESS_ID');
+ expect(toaster.success).toHaveBeenCalledWith('Address Deleted', 'Success');
+ expect(myAddressesCtrl.list).toEqual({Items:[]});
+ });
+ });
+ });
+});
\ No newline at end of file
diff --git a/src/app/myOrders/myOrders.js b/src/app/myOrders/myOrders.js
new file mode 100644
index 00000000..b3fd1653
--- /dev/null
+++ b/src/app/myOrders/myOrders.js
@@ -0,0 +1,204 @@
+angular.module('orderCloud')
+ .config(MyOrdersConfig)
+ .controller('MyOrdersCtrl', MyOrdersController)
+ .controller('MyOrderDetailCtrl', MyOrderDetailController)
+
+function MyOrdersConfig($stateProvider) {
+ $stateProvider
+ .state('myOrders', {
+ parent: 'account',
+ templateUrl: 'myOrders/templates/myOrders.tpl.html',
+ controller: 'MyOrdersCtrl',
+ controllerAs: 'myOrders',
+ data: {
+ pageTitle: "Order History"
+ },
+ url: '/myorders?from&to&search&page&pageSize&searchOn&sortBy&filters?favorites',
+ resolve: {
+ Parameters: function($stateParams, ocParameters) {
+ return ocParameters.Get($stateParams);
+ },
+ OrderList: function(OrderCloud, Parameters, CurrentUser) {
+ if (Parameters.favorites && CurrentUser.xp.FavoriteOrders) {
+ Parameters.filters ? angular.extend(Parameters.filters, Parameters.filters, {ID:CurrentUser.xp.FavoriteOrders.join('|')}) : Parameters.filters = {ID:CurrentUser.xp.FavoriteOrders.join('|')};
+ } else if (Parameters.filters) {
+ delete Parameters.filters.ID;
+ }
+ var showSubmittedOnly = angular.extend({}, Parameters.filters, {Status:'!Unsubmitted'});
+ return OrderCloud.Me.ListOutgoingOrders(Parameters.search, Parameters.page, Parameters.pageSize || 12, Parameters.searchOn, Parameters.sortBy, showSubmittedOnly, Parameters.from, Parameters.to);
+ }
+ }
+ })
+ .state('myOrders.detail', {
+ url: '/:orderid',
+ templateUrl: 'myOrders/templates/myOrders.detail.tpl.html',
+ controller: 'MyOrderDetailCtrl',
+ controllerAs: 'myOrderDetail',
+ resolve: {
+ SelectedOrder: function($stateParams, OrderCloud) {
+ return OrderCloud.Me.GetOrder($stateParams.orderid);
+ },
+ SelectedPayments: function($stateParams, $q, OrderCloud) {
+ var deferred = $q.defer();
+ OrderCloud.Payments.List($stateParams.orderid)
+ .then(function(data) {
+ var queue = [];
+ angular.forEach(data.Items, function(payment, index) {
+ if (payment.Type === 'CreditCard' && payment.CreditCardID) {
+ queue.push((function() {
+ var d = $q.defer();
+ OrderCloud.Me.GetCreditCard(payment.CreditCardID)
+ .then(function(cc) {
+ data.Items[index].Details = cc;
+ d.resolve();
+ });
+ return d.promise;
+ })());
+ } else if (payment.Type === 'SpendingAccount' && payment.SpendingAccountID) {
+ queue.push((function() {
+ var d = $q.defer();
+ OrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID)
+ .then(function(cc) {
+ data.Items[index].Details = cc;
+ d.resolve();
+ });
+ return d.promise;
+ })());
+ }
+ });
+ $q.all(queue)
+ .then(function() {
+ deferred.resolve(data);
+ })
+ });
+
+ return deferred.promise;
+ },
+ LineItemList: function($q, $stateParams, OrderCloud, ocLineItems) {
+ var dfd = $q.defer();
+ OrderCloud.LineItems.List($stateParams.orderid, null, 1, 100)
+ .then(function(data) {
+ ocLineItems.GetProductInfo(data.Items)
+ .then(function() {
+ dfd.resolve(data);
+ });
+ });
+ return dfd.promise;
+ },
+ PromotionList: function($stateParams, OrderCloud){
+ return OrderCloud.Orders.ListPromotions($stateParams.orderid);
+ }
+ }
+ });
+}
+
+function MyOrdersController($state, $ocMedia, OrderCloud, ocParameters, OrderList, Parameters) {
+ var vm = this;
+ vm.list = OrderList;
+ vm.parameters = Parameters;
+ vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null;
+
+ //Check if filters are applied
+ vm.filtersApplied = vm.parameters.filters || vm.parameters.from || vm.parameters.to || ($ocMedia('max-width:767px') && vm.sortSelection); //Sort by is a filter on mobile devices
+ vm.showFilters = vm.filtersApplied;
+
+ //Check if search was used
+ vm.searchResults = Parameters.search && Parameters.search.length > 0;
+
+ //Reload the state with new parameters
+ vm.filter = function(resetPage) {
+ if(vm.parameters.filters && vm.parameters.filters.Status === null) delete vm.parameters.filters.Status;
+ $state.go('.', ocParameters.Create(vm.parameters, resetPage));
+ };
+
+ vm.toggleFavorites = function() {
+ if (vm.parameters.filters && vm.parameters.filters.ID) delete vm.parameters.filters.ID;
+ if (vm.parameters.favorites) {
+ vm.parameters.favorites = '';
+ } else {
+ vm.parameters.favorites = true;
+ vm.parameters.page = '';
+ }
+ vm.filter(true);
+ };
+
+ //Reload the state with new search parameter & reset the page
+ vm.search = function() {
+ vm.filter(true);
+ };
+
+ //Clear the search parameter, reload the state & reset the page
+ vm.clearSearch = function() {
+ vm.parameters.search = null;
+ vm.filter(true);
+ };
+
+ //Clear relevant filters, reload the state & reset the page
+ vm.clearFilters = function() {
+ vm.parameters.filters = null;
+ vm.parameters.favorites = null;
+ vm.parameters.from = null;
+ vm.parameters.to = null;
+ $ocMedia('max-width:767px') ? vm.parameters.sortBy = null : angular.noop(); //Clear out sort by on mobile devices
+ vm.filter(true);
+ };
+
+ //Conditionally set, reverse, remove the sortBy parameter & reload the state
+ 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);
+ };
+
+ //Used on mobile devices
+ vm.reverseSort = function() {
+ Parameters.sortBy.indexOf('!') == 0 ? vm.parameters.sortBy = Parameters.sortBy.split('!')[1] : vm.parameters.sortBy = '!' + Parameters.sortBy;
+ vm.filter(false);
+ };
+
+ //Reload the state with the incremented page parameter
+ vm.pageChanged = function(page) {
+ $state.go('.', {page: page});
+ };
+
+ //Load the next page of results with all of the same parameters
+ vm.loadMore = function() {
+ return OrderCloud.Me.ListIncomingOrders(Parameters.from, Parameters.to, Parameters.search, vm.list.Meta.Page + 1, Parameters.pageSize || vm.list.Meta.PageSize, Parameters.searchOn, Parameters.sortBy, Parameters.filters)
+ .then(function(data) {
+ vm.list.Items = vm.list.Items.concat(data.Items);
+ vm.list.Meta = data.Meta;
+ });
+ };
+}
+
+function MyOrderDetailController($state, $exceptionHandler, toastr, OrderCloud, ocConfirm, SelectedOrder, SelectedPayments, LineItemList, PromotionList) {
+ var vm = this;
+ vm.order = SelectedOrder;
+ vm.list = LineItemList;
+ vm.paymentList = SelectedPayments.Items;
+ vm.canCancel = SelectedOrder.Status === 'Unsubmitted' || SelectedOrder.Status === 'AwaitingApproval';
+ vm.promotionList = PromotionList.Meta ? PromotionList.Items : PromotionList;
+
+ vm.cancelOrder = function(orderid) {
+ ocConfirm.Confirm('Are you sure you want to cancel this order?')
+ .then(function() {
+ OrderCloud.Orders.Cancel(orderid)
+ .then(function() {
+ $state.go('myOrders', {}, {reload: true});
+ toastr.success('Order Cancelled', 'Success');
+ })
+ .catch(function(ex) {
+ $exceptionHandler(ex);
+ });
+ });
+ };
+}
\ No newline at end of file
diff --git a/src/app/myOrders/myOrders.md b/src/app/myOrders/myOrders.md
new file mode 100644
index 00000000..fb5afd12
--- /dev/null
+++ b/src/app/myOrders/myOrders.md
@@ -0,0 +1,7 @@
+## MyOrders Component Overview
+
+This component allows you to list, edit, and delete your orders.
+
+You can also list, edit and delete Line Items associated with the order in this component.
+
+MyOrders is a buyer specific admin component.
\ No newline at end of file
diff --git a/src/app/myOrders/templates/myOrders.detail.tpl.html b/src/app/myOrders/templates/myOrders.detail.tpl.html
new file mode 100644
index 00000000..e402d203
--- /dev/null
+++ b/src/app/myOrders/templates/myOrders.detail.tpl.html
@@ -0,0 +1,136 @@
+
+
+
+ Cancel Order
+ Order ID: {{myOrderDetail.order.ID}}
+
+
+
+
Date Submitted: {{myOrderDetail.order.DateSubmitted | date:'short'}}
+
Subtotal: {{myOrderDetail.order.Subtotal | currency}}
+
Shipping: + {{myOrderDetail.order.ShippingCost | currency}}
+
Tax: + {{myOrderDetail.order.TaxCost | currency}}
+
+ {{promotion.Code}}
+ - {{promotion.Amount | currency}}
+
+
Total: {{myOrderDetail.order.Total | currency}}
+
+
+
+
+
+
{{payment.Type | humanize}} {{payment.Amount | currency}}
+
+
PO#: {{payment.xp.PONumber}}
+
+
+ XXXX-XXXX-XXXX- {{payment.Details.PartialAccountNumber}}
+
+
+
+ {{payment.Details.Name}} Remaining Balance: {{payment.Details.Balance | currency}}
+
+
+
+
+
Delivery Address
+
+
Billing Address
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{lineItem.ProductID}}
+
+
+ {{spec.Name}}:
+ {{spec.Value}}
+
+
+
+
+
+
+
{{lineItem.UnitPrice | currency}}
+
+
+
+ {{lineItem.Quantity}}
+
+
+ {{'x ' + lineItem.Product.QuantityMultiplier + (lineItem.Quantity ? (' (' + (lineItem.Quantity * lineItem.Product.QuantityMultiplier) + ')') : '')}}
+
+
+
+
{{lineItem.LineTotal | currency}}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/myOrders/templates/myOrders.tpl.html b/src/app/myOrders/templates/myOrders.tpl.html
new file mode 100644
index 00000000..0b99914f
--- /dev/null
+++ b/src/app/myOrders/templates/myOrders.tpl.html
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+ Order Status
+
+ All
+ Open
+ Awaiting Approval
+ Completed
+ Declined
+ Cancelled
+
+
+
+
+
+
+
+
+ My Favorites
+
+
+
+
+
+
+
+
+ No matches found.
+
+
+
{{(application.$ocMedia('min-width:768px') ? myOrders.list.Meta.ItemRange[0] : '1') + ' - ' + myOrders.list.Meta.ItemRange[1] + ' of ' + myOrders.list.Meta.TotalCount + ' results'}}
+
+
+
+
+
+ ID
+
+
+
+
+ Status
+
+
+
+
+ Date Submitted
+
+
+ Total
+
+
+
+
+
+
+ {{order.ID}}
+ {{order.Status}}
+ {{(order.DateSubmitted || order.DateCreated) | date}}
+ {{order.Total | currency}}
+
+ View Order
+
+
+
+
+
+
+
Load More
+
\ No newline at end of file
diff --git a/src/app/myOrders/tests/myOrders.spec.js b/src/app/myOrders/tests/myOrders.spec.js
new file mode 100644
index 00000000..bb4ac9c0
--- /dev/null
+++ b/src/app/myOrders/tests/myOrders.spec.js
@@ -0,0 +1,236 @@
+describe('Component: MyOrders', function() {
+ var scope,
+ q,
+ oc,
+ _ocParameters,
+ _ocLineItems,
+ mockParams,
+ state,
+ currentUser;
+ beforeEach(module(function($provide) {
+ mockParams = {search:null, page: null, pageSize: null, searchOn: null, sortBy: null, filters: null, from: null, to: null, favorites: null};
+ $provide.value('Parameters', mockParams);
+ $provide.value('CurrentUser', {ID:"FAKE_USER"});
+ }));
+ beforeEach(module('orderCloud'));
+ beforeEach(module('orderCloud.sdk'));
+ beforeEach(inject(function($q, $rootScope, OrderCloud, ocParameters, ocLineItems, CurrentUser, $state) {
+ q = $q;
+ scope = $rootScope.$new();
+ oc = OrderCloud;
+ _ocParameters = ocParameters;
+ _ocLineItems = ocLineItems;
+ state = $state;
+ currentUser = CurrentUser;
+ }));
+
+ describe('State: myOrders', function() {
+ var state;
+ beforeEach(inject(function($state) {
+ state = $state.get('myOrders');
+ spyOn(_ocParameters, 'Get');
+ spyOn(oc.Me, 'ListOutgoingOrders');
+ }));
+ it('should resolve Parameters', inject(function($injector){
+ $injector.invoke(state.resolve.Parameters);
+ expect(_ocParameters.Get).toHaveBeenCalled();
+ }));
+ it('should resolve OrderList', inject(function($injector) {
+ mockParams.filters = {Status:'!Unsubmitted'};
+ mockParams.pageSize = 12;
+ $injector.invoke(state.resolve.OrderList);
+ expect(oc.Me.ListOutgoingOrders).toHaveBeenCalledWith(null, null, 12, null, null, {Status:'!Unsubmitted'}, null, null);
+ }));
+ });
+ describe('State: myOrders.detail', function() {
+ var state,
+ stateParams,
+ mockPaymentList
+ ;
+ beforeEach(inject(function($state, $stateParams) {
+ stateParams = $stateParams;
+ stateParams.orderid = 'FAKE_ORDER';
+ state = $state.get('myOrders.detail');
+
+ mockPaymentList = {
+ Items: [{
+ Type:'CreditCard',
+ CreditCardID:'CreditCardID123'
+ }]
+ };
+ var defer = q.defer();
+ defer.resolve(mockPaymentList);
+
+ var lidefer = q.defer();
+ defer.resolve({Items:[]});
+
+ spyOn(oc.Me, 'GetOrder');
+ spyOn(oc.Payments, 'List').and.returnValue(defer.promise);
+ spyOn(oc.Me, 'GetCreditCard');
+ spyOn(oc.LineItems, 'List').and.returnValue(lidefer.promise);
+ spyOn(oc.Orders, 'ListPromotions');
+ }));
+ it('should resolve SelectedOrder', inject(function($injector) {
+ $injector.invoke(state.resolve.SelectedOrder);
+ expect(oc.Me.GetOrder).toHaveBeenCalledWith(stateParams.orderid);
+ }));
+ it('should resolve SelectedPayments', inject(function($injector){
+ $injector.invoke(state.resolve.SelectedPayments);
+ expect(oc.Payments.List).toHaveBeenCalledWith(stateParams.orderid);
+ scope.$digest();
+ expect(oc.Me.GetCreditCard).toHaveBeenCalledWith(mockPaymentList.Items[0].CreditCardID);
+ }));
+ it('should resolve LineItemList with full product info', inject(function($injector) {
+ $injector.invoke(state.resolve.LineItemList);
+ expect(oc.LineItems.List).toHaveBeenCalledWith(stateParams.orderid, null, 1, 100);
+ }));
+ it('should resolve PromotionList', inject(function($injector){
+ $injector.invoke(state.resolve.PromotionList);
+ expect(oc.Orders.ListPromotions).toHaveBeenCalledWith(stateParams.orderid);
+ }));
+ });
+ describe('Controller: MyOrdersCtrl', function(){
+ var myOrdersCtrl,
+ ocMedia
+ ;
+ beforeEach(inject(function($controller, $ocMedia, Parameters){
+ ocMedia = $ocMedia;
+ myOrdersCtrl = $controller('MyOrdersCtrl', {
+ $state: state,
+ $ocMedia: ocMedia,
+ OrderCloud: oc,
+ ocParameters: _ocParameters,
+ OrderList: [],
+ Parameters: Parameters
+ });
+ spyOn(_ocParameters, 'Create');
+ spyOn(state, 'go');
+ }));
+ describe('search', function(){
+ beforeEach(function(){
+ mockParams.search = 'Product1';
+ myOrdersCtrl.search();
+ });
+ it('should reload state with search parameters: vm.parameters.search', function(){
+ expect(state.go).toHaveBeenCalled();
+ expect(_ocParameters.Create).toHaveBeenCalledWith(mockParams, true);
+ });
+ });
+ describe('clearSearch', function(){
+ beforeEach(function(){
+ mockParams.search = 'Product1';
+ myOrdersCtrl.clearSearch();
+ });
+ it('should reload state with search parameters cleared', function(){
+ expect(state.go).toHaveBeenCalled();
+ expect(_ocParameters.Create).toHaveBeenCalledWith(mockParams, true);
+ });
+ });
+ describe('clearFilters', function(){
+ var clearedParams;
+ beforeEach(function(){
+ clearedParams = angular.copy(mockParams);
+ mockParams.filters = {ID:'mockID123'};
+ mockParams.from = '12/01/2016';
+ mockParams.to = '12/12/2016';
+ myOrdersCtrl.clearFilters();
+ });
+ it('should reload state with the following parameters cleared: filter, from, and to', function(){
+ expect(state.go).toHaveBeenCalled();
+ expect(_ocParameters.Create).toHaveBeenCalledWith(clearedParams, true);
+ });
+ });
+ describe('reverseSort', function(){
+ var expectedParams;
+ beforeEach(function(){
+ expectedParams = angular.copy(mockParams);
+ });
+ it('if param.sortBy is !something it should reload state with param.sortBy equal to something', function(){
+ mockParams.sortBy = '!Something';
+ expectedParams.sortBy = 'Something';
+ myOrdersCtrl.reverseSort();
+ expect(state.go).toHaveBeenCalled();
+ expect(_ocParameters.Create).toHaveBeenCalledWith(expectedParams, false);
+ }),
+ it('if param.sortBy is something it should reload state with param.sortBy equal to !something', function(){
+ mockParams.sortBy = 'Something';
+ expectedParams.sortBy = '!Something';
+ myOrdersCtrl.reverseSort();
+ expect(state.go).toHaveBeenCalled();
+ expect(_ocParameters.Create).toHaveBeenCalledWith(expectedParams, false);
+ });
+ });
+ describe('pageChanged', function(){
+ it('should reload state with selected page', function(){
+ var mockPage = '3';
+ myOrdersCtrl.pageChanged(mockPage);
+ expect(state.go).toHaveBeenCalledWith('.', {page: mockPage});
+ });
+ });
+ describe('loadMore', function(){
+ beforeEach(function(){
+ var defer = q.defer();
+ defer.resolve();
+ spyOn(oc.Me, 'ListIncomingOrders').and.returnValue(defer.promise);
+ myOrdersCtrl.list = {
+ Meta: {
+ Page: 1,
+ PageSize: 12
+ }
+ };
+ myOrdersCtrl.loadMore();
+ });
+ it('should load the next page of results', function(){
+ expect(oc.Me.ListIncomingOrders).toHaveBeenCalledWith(null, null, null, 2, 12, null, null, null);
+ });
+ });
+ });
+ describe('Controller: MyOrderDetailCtrl', function() {
+ var orderDetailCtrl,
+ confirm,
+ toaster,
+ mockOrderID
+ ;
+ beforeEach(inject(function($controller, toastr, ocConfirm) {
+ toaster = toastr;
+ confirm = ocConfirm;
+ mockOrderID = 'Order123';
+ orderDetailCtrl = $controller('MyOrderDetailCtrl', {
+ $scope: scope,
+ $state: state,
+ toaster: toastr,
+ OrderCloud: oc,
+ ocConfirm: ocConfirm,
+ SelectedOrder: [],
+ SelectedPayments: [],
+ LineItemList: [],
+ PromotionList:[]
+ });
+ spyOn(state, 'go');
+ }));
+
+ describe('cancelOrder', function() {
+ beforeEach(function() {
+ var defer = q.defer();
+ defer.resolve();
+ spyOn(confirm, 'Confirm').and.returnValue(defer.promise);
+ spyOn(oc.Orders, 'Cancel').and.returnValue(defer.promise);
+ spyOn(toaster, 'success');
+ orderDetailCtrl.cancelOrder(mockOrderID);
+ });
+ it('should call OrderCloud Confirm', function() {
+ expect(confirm.Confirm).toHaveBeenCalledWith('Are you sure you want to cancel this order?');
+ });
+ it('should call Orders.Cancel', function(){
+ scope.$digest();
+ expect(oc.Orders.Cancel).toHaveBeenCalledWith(mockOrderID);
+ });
+ it('should call state.go and take user to myOrders state', function(){
+ scope.$digest();
+ expect(state.go).toHaveBeenCalledWith('myOrders', {}, {reload: true});
+ expect(toaster.success).toHaveBeenCalledWith('Order Cancelled', 'Success');
+ });
+ });
+ });
+});
+
diff --git a/src/app/myOrders/tests/myOrders.test.js b/src/app/myOrders/tests/myOrders.test.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/myPayments/myPaymentCreditCard.modalFactory.js b/src/app/myPayments/myPaymentCreditCard.modalFactory.js
new file mode 100644
index 00000000..de77d5d9
--- /dev/null
+++ b/src/app/myPayments/myPaymentCreditCard.modalFactory.js
@@ -0,0 +1,86 @@
+angular.module('orderCloud')
+ .factory('MyPaymentCreditCardModal', MyPaymentCreditCardModalFactory)
+ .controller('CreateCreditCardModalCtrl', CreateCreditCardModalController)
+ .controller('EditCreditCardModalCtrl', EditCreditCardModalController)
+;
+
+function MyPaymentCreditCardModalFactory($uibModal) {
+ return {
+ Create: _create,
+ Edit: _edit
+ };
+
+ function _create() {
+ return $uibModal.open({
+ templateUrl: 'myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html',
+ controller: 'CreateCreditCardModalCtrl',
+ controllerAs: 'createCreditCard',
+ size: 'md'
+ }).result;
+ }
+
+ function _edit(creditCard) {
+ var creditCardCopy = angular.copy(creditCard);
+ return $uibModal.open({
+ templateUrl: 'myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html',
+ controller: 'EditCreditCardModalCtrl',
+ controllerAs: 'editCreditCard',
+ size: 'md',
+ resolve: {
+ SelectedCreditCard: function() {
+ return creditCardCopy;
+ }
+ }
+ }).result;
+ }
+}
+
+function CreateCreditCardModalController($q, $exceptionHandler, $uibModalInstance, ocCreditCardUtility, ocAuthNet) {
+ var vm = this;
+ vm.creditCardInfo = ocCreditCardUtility;
+ vm.creditCard = {};
+
+ vm.cancel = function() {
+ $uibModalInstance.dismiss();
+ };
+
+ vm.submit = function() {
+ vm.loading = {
+ message: 'Creating Credit Card'
+ };
+ vm.loading.promise = ocAuthNet.CreateCreditCard(vm.creditCard)
+ .then(function(data){
+ $uibModalInstance.close(data.ResponseBody);
+ })
+ .catch(function(error){
+ $exceptionHandler(error);
+ });
+ };
+}
+
+function EditCreditCardModalController($q, $exceptionHandler, $uibModalInstance, ocCreditCardUtility, ocAuthNet, SelectedCreditCard) {
+ var vm = this;
+ vm.creditCardInfo = ocCreditCardUtility;
+ vm.creditCard = SelectedCreditCard;
+ var date = new Date(vm.creditCard.ExpirationDate);
+ vm.creditCard.ExpirationMonth = (date.toISOString().substring(5,7));
+ vm.creditCard.ExpirationYear = date.getFullYear();
+
+ vm.cancel = function() {
+ $uibModalInstance.dismiss();
+ };
+
+ vm.submit = function() {
+ //loading indicator promise
+ vm.loading = {
+ message: 'Editing Credit Card'
+ };
+ vm.loading.promise = ocAuthNet.UpdateCreditCard(vm.creditCard)
+ .then(function(data){
+ $uibModalInstance.close(data.ResponseBody);
+ })
+ .catch(function(error){
+ $exceptionHandler(error);
+ });
+ };
+}
diff --git a/src/app/myPayments/myPayments.js b/src/app/myPayments/myPayments.js
new file mode 100644
index 00000000..4a7568ae
--- /dev/null
+++ b/src/app/myPayments/myPayments.js
@@ -0,0 +1,67 @@
+angular.module('orderCloud')
+ .config(MyPaymentsConfig)
+ .controller('MyPaymentsCtrl', MyPaymentsController)
+;
+
+function MyPaymentsConfig($stateProvider) {
+ $stateProvider
+ .state('myPayments', {
+ parent: 'account',
+ url: '/payments',
+ templateUrl: 'myPayments/templates/myPayments.tpl.html',
+ controller: 'MyPaymentsCtrl',
+ controllerAs: 'myPayments',
+ data: {
+ pageTitle: "Payment Methods"
+ },
+ resolve: {
+ UserCreditCards: function(OrderCloud) {
+ return OrderCloud.Me.ListCreditCards(null, null, null, null, null, {'Editable':true});
+ },
+ UserSpendingAccounts: function(OrderCloud) {
+ return OrderCloud.Me.ListSpendingAccounts(null, null, null, null, null, {'RedemptionCode': '!*'});
+ },
+ GiftCards: function(OrderCloud) {
+ return OrderCloud.Me.ListSpendingAccounts(null, null, null,null, null, {'RedemptionCode': '*'});
+ }
+ }
+ });
+}
+
+function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, ocAuthNet, MyPaymentCreditCardModal, UserCreditCards, UserSpendingAccounts, GiftCards) {
+ var vm = this;
+ vm.personalCreditCards = UserCreditCards;
+ vm.personalSpendingAccounts = UserSpendingAccounts;
+ vm.giftCards = GiftCards;
+
+ vm.createCreditCard = function(){
+ MyPaymentCreditCardModal.Create()
+ .then(function(data) {
+ toastr.success('Credit Card Created', 'Success');
+ vm.personalCreditCards.Items.push(data);
+ });
+ };
+
+ vm.edit = function(scope){
+ MyPaymentCreditCardModal.Edit(scope.creditCard)
+ .then(function(data){
+ toastr.success('Credit Card Updated', 'Success');
+ vm.personalCreditCards.Items[scope.$index] = data;
+ });
+ };
+
+ vm.delete = function(scope){
+ vm.loading = [];
+ ocConfirm.Confirm("Are you sure you want to delete this Credit Card?")
+ .then(function(){
+ vm.loading[scope.$index] = ocAuthNet.DeleteCreditCard(scope.creditCard)
+ .then(function(){
+ toastr.success('Credit Card Deleted', 'Success');
+ vm.personalCreditCards.Items.splice(scope.$index, 1);
+ })
+ .catch(function(error) {
+ $exceptionHandler(error);
+ });
+ });
+ };
+}
\ No newline at end of file
diff --git a/src/app/myPayments/templates/myPayments.tpl.html b/src/app/myPayments/templates/myPayments.tpl.html
new file mode 100644
index 00000000..0409a808
--- /dev/null
+++ b/src/app/myPayments/templates/myPayments.tpl.html
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{creditCard.CardholderName}} {{'XXXX-XXXX-XXXX-' + creditCard.PartialAccountNumber}} Expires On: {{creditCard.ExpirationDate | date:'MM/yy'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{spendingAccount.Name}}
+
+
+ Lifetime: {{spendingAccount.StartDate | date:'shortDate'}} - {{spendingAccount.EndDate | date :'shortDate'}}
+
+
+ Made Available On: {{spendingAccount.StartDate | date:'shortDate'}}
+
+
+ Expires On: {{spendingAccount.EndDate | date :'shortDate'}}
+
+
+
+
+
+
{{spendingAccount.Balance | currency}}
+
+
+
+
+
+
+
+
+
+
+
+
{{giftCard.Name}}
+
Redemption Code: {{giftCard.RedemptionCode}}
+
+
+ Lifetime: {{giftCard.StartDate | date:'shortDate'}} - {{giftCard.EndDate | date :'shortDate'}}
+
+
+ Made Available On: {{giftCard.StartDate | date:'shortDate'}}
+
+
+ Expires On: {{giftCard.EndDate | date :'shortDate'}}
+
+
+
+
+
{{giftCard.Balance | currency}}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html
new file mode 100644
index 00000000..c5574942
--- /dev/null
+++ b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html
@@ -0,0 +1,83 @@
+
\ No newline at end of file
diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html
new file mode 100644
index 00000000..7e4e73bc
--- /dev/null
+++ b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html
@@ -0,0 +1,53 @@
+