From 84acfbea069f327de72c19087b1f829dc0eb08f2 Mon Sep 17 00:00:00 2001 From: Aisha Ragheb Date: Thu, 12 Jan 2017 15:12:18 -0600 Subject: [PATCH 001/158] CCN-212 login styles for buyer app --- src/app/styles/pages/_login.less | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/styles/pages/_login.less b/src/app/styles/pages/_login.less index 5447b4e9..aa56a1bc 100644 --- a/src/app/styles/pages/_login.less +++ b/src/app/styles/pages/_login.less @@ -5,7 +5,15 @@ bottom:0; top:0; .panel { + top: 15em; max-width:300px; margin:0 auto; + // for layout on small screens + @media (max-width: @screen-sm-max) { + background-color: transparent; + top: 5em; + border: none; + box-shadow: none; + } } } \ No newline at end of file From dd2427461e8c7c396e1b825a8588f8d3ca9b081b Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Fri, 13 Jan 2017 15:20:45 -0600 Subject: [PATCH 002/158] Adding angular-payments bower package --- bower.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 1b3e82bf..efa9a2cc 100644 --- a/bower.json +++ b/bower.json @@ -41,7 +41,8 @@ "angular-ui-router": "^0.3.1", "angular-tree-control": "^0.2.28", "angular-sticky": "angular-sticky-plugin#^0.3.0", - "angular-busy2": "^5.2.0" + "angular-busy2": "^5.2.0", + "angular-payments": "*" }, "devDependencies": { "angular-mocks": "^1.6.0" From 275f035b9a8b256fae3b174944e747cee0e1cf4a Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Fri, 13 Jan 2017 17:21:30 -0600 Subject: [PATCH 003/158] CCN-239 - Improve Credit Card form UX --- src/app/app.constants.json | 8 +- src/app/app.module.js | 3 +- .../myPaymentCreditCard.modalFactory.js | 5 + ...myPaymentsCreditCard.create.modal.tpl.html | 128 ++++++++++-------- .../myPaymentsCreditCard.edit.modal.tpl.html | 71 +++++----- 5 files changed, 120 insertions(+), 95 deletions(-) diff --git a/src/app/app.constants.json b/src/app/app.constants.json index ea190d0d..d6f332b9 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,9 +1,9 @@ { - "appname": "Angular Buyer", + "appname": "CUPS Cafe Network", "scope": "FullAccess", - "clientid": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX", - "buyerid": "XXXX", - "catalogid": "XXXX", + "clientid": "F286B844-C604-4081-9D22-F79EA176D8DC", + "buyerid": "cafebiba", + "catalogid": "defaultCupsCatalog", "environment": "prod", "defaultstate": "home", "anonymous": false diff --git a/src/app/app.module.js b/src/app/app.module.js index 5dbf7981..15ff7ed2 100644 --- a/src/app/app.module.js +++ b/src/app/app.module.js @@ -12,6 +12,7 @@ angular.module('orderCloud', [ 'angular-busy', 'jcs-autoValidate', 'treeControl', - 'hl.sticky' + 'hl.sticky', + 'angularPayments' ] ); \ No newline at end of file diff --git a/src/app/myPayments/myPaymentCreditCard.modalFactory.js b/src/app/myPayments/myPaymentCreditCard.modalFactory.js index de77d5d9..38156603 100644 --- a/src/app/myPayments/myPaymentCreditCard.modalFactory.js +++ b/src/app/myPayments/myPaymentCreditCard.modalFactory.js @@ -48,6 +48,10 @@ function CreateCreditCardModalController($q, $exceptionHandler, $uibModalInstanc vm.loading = { message: 'Creating Credit Card' }; + + vm.creditCard.ExpirationMonth = vm.creditCard.ExpirationDate.split('/')[0]; + vm.creditCard.ExpirationYear = vm.creditCard.ExpirationDate.split('/')[1]; + vm.loading.promise = ocAuthNet.CreateCreditCard(vm.creditCard) .then(function(data){ $uibModalInstance.close(data.ResponseBody); @@ -65,6 +69,7 @@ function EditCreditCardModalController($q, $exceptionHandler, $uibModalInstance, var date = new Date(vm.creditCard.ExpirationDate); vm.creditCard.ExpirationMonth = (date.toISOString().substring(5,7)); vm.creditCard.ExpirationYear = date.getFullYear(); + vm.creditCard.ExpirationDate = date.getMonth() + "/" + date.getFullYear(); vm.cancel = function() { $uibModalInstance.dismiss(); diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html index c5574942..b64175d6 100644 --- a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html +++ b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html @@ -1,3 +1,36 @@ +
@@ -8,71 +41,47 @@

New Credit Card

- + ng-model="createCreditCard.creditCard.CardholderName" + disable-validation-message="">
+
+
- - Card Number + + ng-model="createCreditCard.creditCard.CardNumber" + payments-validate="card" + payments-format="card" + payments-type-model="createCreditCard.creditCard.CardType" + ng-class="createCreditCard.creditCard.CardType" + disable-validation-message=""/>
-
-
-
-
-
- - -
-
- - -
+
+
+ +
-
-
-
- - -
-
- - -
-
+
+
+ + + +
@@ -80,4 +89,5 @@

New Credit Card

- \ 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 index 7e4e73bc..e01f0651 100644 --- a/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html +++ b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html @@ -8,46 +8,55 @@

Edit your
-
+
- + ng-model="editCreditCard.creditCard.CardholderName" + disable-validation-message="">
-
- -
- - +
+ +
-
- - +
+
+ + +
+
+
+ + - +
+
-
-
+
- +
- \ No newline at end of file + + From e6b2d95a96d6e3d07baf10376847828a956d4d02 Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Fri, 13 Jan 2017 17:26:37 -0600 Subject: [PATCH 004/158] CCN-239 - Improve Credit Card form UX --- src/app/styles/components/_creditcard.less | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/app/styles/components/_creditcard.less diff --git a/src/app/styles/components/_creditcard.less b/src/app/styles/components/_creditcard.less new file mode 100644 index 00000000..853441e3 --- /dev/null +++ b/src/app/styles/components/_creditcard.less @@ -0,0 +1,31 @@ +.ng-invalid { + border-color: #f00 !important; +} +.visa { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjU5LjA1NXB4IiBoZWlnaHQ9IjIwMi4wNjlweCIgdmlld0JveD0iMCAwIDY1OS4wNTUgMjAyLjA2OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjU5LjA1NSAyMDIuMDY5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KCTxnPg0KCQk8cG9seWdvbiBmaWxsPSIjMDAyNDlGIiBwb2ludHM9IjIzMi4xNzgsMTk5LjE2NCAyNjUuNTM5LDMuNDAyIDMxOC44OTgsMy40MDIgMjg1LjUxNCwxOTkuMTY0IAkJIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik00NzkuMDQsOC4yMjJDNDY4LjQ2OCw0LjI1Niw0NTEuOTA0LDAsNDMxLjIxNywwYy01Mi43MjQsMC04OS44NjMsMjYuNTUyLTkwLjE4LDY0LjYwNA0KCQkJYy0wLjI5NywyOC4xMjksMjYuNTE0LDQzLjgyLDQ2Ljc1NCw1My4xODVjMjAuNzcsOS41OTUsMjcuNzUyLDE1LjcxNSwyNy42NTIsMjQuMjgzYy0wLjEzMSwxMy4xMjItMTYuNTg2LDE5LjExNy0zMS45MjIsMTkuMTE3DQoJCQljLTIxLjM1NywwLTMyLjcwMy0yLjk2Ny01MC4yMjctMTAuMjc2bC02Ljg3Ni0zLjExMWwtNy40ODksNDMuODIzYzEyLjQ2Miw1LjQ2NCwzNS41MDksMTAuMTk5LDU5LjQzOCwxMC40NDQNCgkJCWM1Ni4wODksMCw5Mi41MDEtMjYuMjQ3LDkyLjkxNS02Ni44ODJjMC4yMDEtMjIuMjctMTQuMDE2LTM5LjIxNy00NC43OTktNTMuMTg4Yy0xOC42NTEtOS4wNTYtMzAuMDczLTE1LjA5OS0yOS45NTItMjQuMjY5DQoJCQljMC04LjEzNyw5LjY2OC0xNi44MzgsMzAuNTU3LTE2LjgzOGMxNy40NDktMC4yNzEsMzAuMDg4LDMuNTM0LDM5LjkzNyw3LjVsNC43ODEsMi4yNTlMNDc5LjA0LDguMjIyIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik02MTUuODY3LDMuNTg5aC00MS4yMzFjLTEyLjc3MiwwLTIyLjMzMSwzLjQ4Ni0yNy45NCwxNi4yMzRMNDY3LjQ1LDE5OS4yMjZoNTYuMDMxDQoJCQljMCwwLDkuMTYxLTI0LjEyMiwxMS4yMzMtMjkuNDE4YzYuMTIzLDAsNjAuNTU1LDAuMDg0LDY4LjMzNiwwLjA4NGMxLjU5Nyw2Ljg1Myw2LjQ5MiwyOS4zMzQsNi40OTIsMjkuMzM0aDQ5LjUxMkw2MTUuODY3LDMuNTg5DQoJCQkgTTU1MC4wNywxMjkuNzY3YzQuNDEzLTExLjI3OSwyMS4yNTktNTQuNzI0LDIxLjI1OS01NC43MjRjLTAuMzE1LDAuNTIxLDQuMzgtMTEuMzM0LDcuMDc1LTE4LjY4NGwzLjYwNiwxNi44NzgNCgkJCWMwLDAsMTAuMjE3LDQ2LjcyOSwxMi4zNTMsNTYuNTI4TDU1MC4wNywxMjkuNzY3TDU1MC4wNywxMjkuNzY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjMDAyNDlGIiBkPSJNMTg3LjQyNSwzLjU0NWwtNTIuMjQsMTMzLjQ5NWwtNS41NjYtMjcuMTI5Yy05LjcyNS0zMS4yNzMtNDAuMDI1LTY1LjE1Ni03My44OTktODIuMTE5bDQ3Ljc2NywxNzEuMjAzDQoJCQlsNTYuNDU1LTAuMDY0TDI0My45NDYsMy41NDVIMTg3LjQyNSIvPg0KCQk8cGF0aCBmaWxsPSIjRkZBMDAwIiBkPSJNODYuNzIyLDMuNDI0SDAuNjgxTDAsNy40OTdDNjYuOTM5LDIzLjcwMSwxMTEuMjMyLDYyLjg2LDEyOS42MTgsMTA5LjkxMWwtMTguNzA5LTg5Ljk2DQoJCQlDMTA3LjY3OSw3LjU1NSw5OC4zMTEsMy44NTYsODYuNzIyLDMuNDI0Ii8+DQoJPC9nPg0KPC9nPg0KPC9zdmc+DQo='); + background-size: auto 50%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.amex { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="1.1"
   width="281.89001"
   height="130.42363"
   viewBox="0 0 281.89001 130.42363"
   id="Layer_1"
   xml:space="preserve"><metadata
   id="metadata38"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs36" />
<radialGradient
   cx="57.388199"
   cy="57.021"
   r="264.57971"
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   gradientTransform="matrix(1.0010754,0,0,0.46091624,-7.6472151,-3.502043)">
	<stop
   id="stop4"
   style="stop-color:#9dd5f6;stop-opacity:1"
   offset="0" />
	<stop
   id="stop6"
   style="stop-color:#98d3f5;stop-opacity:1"
   offset="0.0711" />
	<stop
   id="stop8"
   style="stop-color:#89cef3;stop-opacity:1"
   offset="0.1575" />
	<stop
   id="stop10"
   style="stop-color:#70c6ef;stop-opacity:1"
   offset="0.2516" />
	<stop
   id="stop12"
   style="stop-color:#4ebbea;stop-opacity:1"
   offset="0.35139999" />
	<stop
   id="stop14"
   style="stop-color:#23ade3;stop-opacity:1"
   offset="0.45460001" />
	<stop
   id="stop16"
   style="stop-color:#0da6e0;stop-opacity:1"
   offset="0.5" />
	<stop
   id="stop18"
   style="stop-color:#2e77bc;stop-opacity:1"
   offset="1" />
</radialGradient>
<path
   d="M 282.24821,0 H 0 V 130.42363 H 282.24821 V 87.380507 c 1.1212,-0.74622 1.6748,-1.70078 1.6748,-2.86782 0,-1.33574 -0.5536,-2.16309 -1.6748,-2.86"
   id="path20"
   style="fill:url(#SVGID_1_)" />
<g
   transform="translate(-7.639,-88.953933)"
   id="g22">
	<defs
   id="defs24">
		<path
   d="M 289.584,7.598 H 7.639 v 282.966 h 281.945 v -93.386 c 1.12,-1.619 1.673,-3.69 1.673,-6.222 0,-2.898 -0.553,-4.693 -1.673,-6.205"
   id="SVGID_2_" />
	</defs>
	<clipPath
   id="SVGID_3_">
		<use
   id="use28"
   style="overflow:visible"
   x="0"
   y="0"
   width="300"
   height="300"
   xlink:href="#SVGID_2_" />
	</clipPath>
</g>
<path
   d="m 25.414,41.088067 -5.424,-13.217 -5.393,13.217 m 130.307,-5.263 c -1.089,0.661 -2.377,0.683 -3.92,0.683 h -9.627 v -7.364 h 9.758 c 1.381,0 2.822,0.062 3.758,0.598 1.028,0.483 1.664,1.511 1.664,2.931 0,1.449 -0.605,2.615 -1.633,3.152 z m 68.678,5.263 -5.484,-13.217 -5.454,13.217 h 10.938 z m -128.02,14.306 h -8.124 l -0.03,-25.966 -11.491,25.966 h -6.958 l -11.521,-25.989 v 25.989 H 31.32 l -3.045,-7.395 h -16.5 l -3.076,7.395 H 0.092 l 14.191,-33.154 h 11.774 l 13.478,31.39 v -31.39 h 12.934 l 10.371,22.491 9.527,-22.491 h 13.194 v 33.154 z m 32.379,0 H 91.468 v -33.154 h 26.473 v 6.904 H 99.393 v 5.976 h 18.103 v 6.796 H 99.393 v 6.621 h 18.548 v 6.857 z m 37.326,-24.225 c 0,5.286 -3.528,8.017 -5.584,8.837 1.734,0.66 3.215,1.826 3.92,2.792 1.119,1.649 1.312,3.122 1.312,6.083 v 6.513 h -7.993 l -0.03,-4.181 c 0,-1.995 0.191,-4.864 -1.251,-6.459 -1.158,-1.166 -2.923,-1.419 -5.776,-1.419 h -8.507 v 12.059 h -7.924 v -33.154 h 18.227 c 4.05,0 7.034,0.107 9.596,1.588 2.507,1.481 4.01,3.643 4.01,7.341 z m 12.682,24.225 h -8.086 v -33.154 h 8.086 v 33.154 z m 93.808,0 h -11.23 l -15.021,-24.884 v 24.884 h -16.139 l -3.084,-7.395 h -16.462 l -2.992,7.395 h -9.273 c -3.852,0 -8.729,-0.852 -11.491,-3.667 -2.785,-2.815 -4.234,-6.628 -4.234,-12.657 0,-4.917 0.866,-9.412 4.272,-12.964 2.562,-2.646 6.574,-3.866 12.035,-3.866 h 7.672 v 7.104 h -7.511 c -2.892,0 -4.525,0.43 -6.098,1.964 -1.351,1.396 -2.278,4.035 -2.278,7.51 0,3.552 0.706,6.113 2.179,7.786 1.22,1.312 3.437,1.71 5.523,1.71 h 3.559 l 11.169,-26.073 h 11.874 l 13.417,31.359 v -31.359 h 12.066 l 13.93,23.09 v -23.09 h 8.117 v 33.153 z M 0,61.906067 h 13.54 l 3.053,-7.364 h 6.835 l 3.045,7.364 h 26.641 v -5.63 l 2.378,5.654 h 13.83 l 2.378,-5.738 v 5.714 h 66.208 l -0.031,-12.088 h 1.281 c 0.897,0.031 1.159,0.114 1.159,1.595 v 10.493 h 34.243 v -2.814 c 2.762,1.48 7.058,2.814 12.711,2.814 h 14.406 l 3.083,-7.364 h 6.835 l 3.015,7.364 h 27.761 v -6.995 l 4.204,6.995 h 22.246 v -46.24 h -22.016 v 5.461 l -3.083,-5.461 h -22.591 v 5.461 l -2.831,-5.461 h -30.515 c -5.108,0 -9.598,0.713 -13.225,2.7 v -2.7 h -21.058 v 2.7 c -2.308,-2.048 -5.453,-2.7 -8.95,-2.7 H 67.619 l -5.162,11.943 -5.301,-11.943 H 32.924 v 5.461 l -2.662,-5.461 H 9.596 l -9.597,21.985 v 24.255 z"
   id="path30"
   style="fill:#ffffff" />
<path
   d="m 281.945,86.361067 h -14.443 c -1.442,0 -2.4,0.054 -3.207,0.599 -0.836,0.537 -1.158,1.334 -1.158,2.386 0,1.251 0.706,2.102 1.733,2.47 0.836,0.291 1.734,0.376 3.054,0.376 l 4.295,0.115 c 4.334,0.107 7.227,0.852 8.991,2.669 0.321,0.253 0.514,0.537 0.735,0.821 m 0,12.427003 c -1.925,2.815 -5.676,4.242 -10.754,4.242 h -15.304 v -7.111 h 15.242 c 1.512,0 2.57,-0.199 3.207,-0.821 0.552,-0.513 0.937,-1.258 0.937,-2.163 0,-0.966 -0.385,-1.733 -0.968,-2.193 -0.575,-0.506003 -1.412,-0.736003 -2.792,-0.736003 -7.441,-0.253 -16.724,0.23 -16.724,-10.264 0,-4.81 3.054,-9.873 11.37,-9.873 h 15.785 v -6.598 h -14.666 c -4.426,0 -7.641,1.06 -9.918,2.708 v -2.708 h -21.693 c -3.469,0 -7.541,0.86 -9.467,2.708 v -2.708 h -38.738 v 2.708 c -3.083,-2.224 -8.285,-2.708 -10.686,-2.708 h -25.552 v 2.708 c -2.439,-2.362 -7.863,-2.708 -11.169,-2.708 h -28.597 l -6.544,7.082 -6.129,-7.082 H 56.067 v 46.272003 h 41.914 l 6.743,-7.194 6.352,7.194 25.836,0.023 v -10.885 h 2.54 c 3.428,0.053 7.471,-0.085 11.038,-1.627 v 12.488 h 21.31 v -12.06 h 1.028 c 1.312,0 1.441,0.054 1.441,1.365 v 10.694 h 64.736 c 4.11,0 8.406,-1.052 10.785,-2.961 v 2.961 h 20.534 c 4.273,0 8.446,-0.599 11.621,-2.133 v -8.62 z M 250.334,94.976067 c 1.543,1.597 2.37,3.613 2.37,7.026003 0,7.134 -4.457,10.464 -12.449,10.464 H 224.82 v -7.111 h 15.373 c 1.503,0 2.569,-0.199 3.237,-0.821 0.545,-0.513 0.936,-1.258 0.936,-2.163 0,-0.966 -0.423,-1.733 -0.967,-2.193 -0.606,-0.506003 -1.442,-0.736003 -2.822,-0.736003 -7.411,-0.253 -16.692,0.23 -16.692,-10.264 0,-4.81 3.022,-9.873 11.33,-9.873 h 15.887 v 7.058 h -14.537 c -1.441,0 -2.378,0.054 -3.175,0.599 -0.868,0.537 -1.19,1.334 -1.19,2.386 0,1.251 0.737,2.102 1.734,2.47 0.836,0.291 1.734,0.376 3.084,0.376 l 4.266,0.115 c 4.302,0.105 7.255,0.849 9.05,2.667 z m -71.508,-2.048 c -1.06,0.629 -2.371,0.683 -3.913,0.683 h -9.627 v -7.448 h 9.758 c 1.411,0 2.823,0.03 3.782,0.599 1.027,0.537 1.641,1.564 1.641,2.983 0,1.419 -0.614,2.562 -1.641,3.183 z m 4.786,4.127 c 1.764,0.651 3.206,1.818 3.882,2.784 1.119,1.619003 1.281,3.130003 1.313,6.053003 v 6.574 h -7.956 v -4.149 c 0,-1.995 0.192,-4.949 -1.281,-6.491 -1.158,-1.188 -2.923,-1.472 -5.814,-1.472 h -8.469 v 12.112 h -7.963 V 79.304067 h 18.296 c 4.012,0 6.934,0.177 9.535,1.565 2.501,1.511 4.074,3.581 4.074,7.364 -0.001,5.293 -3.531,7.994 -5.617,8.822 z m 10.011,-17.751 h 26.449 v 6.858 h -18.557 v 6.029 h 18.104 v 6.766 h -18.104 v 6.598003 l 18.557,0.03 v 6.881 H 193.623 V 79.304067 z m -53.467,15.304 h -10.241 v -8.445 h 10.333 c 2.861,0 4.847,1.166 4.847,4.066 0,2.868 -1.894,4.379 -4.939,4.379 z m -18.134,14.842003 -12.167,-13.508003 12.167,-13.079 v 26.587003 z m -31.421,-3.895 H 71.117 v -6.598003 h 17.398 v -6.766 H 71.117 v -6.029 h 19.868 l 8.668,9.664 -9.052,9.729003 z m 63.002,-15.326003 c 0,9.212 -6.873,11.114003 -13.8,11.114003 h -9.888 v 11.123 h -15.403 l -9.758,-10.978 -10.141,10.978 H 63.223 V 79.304067 h 31.873 l 9.75,10.87 10.08,-10.87 h 25.322 c 6.289,0 13.355,1.741 13.355,10.925 z"
   id="path32"
   style="fill:#ffffff" />
</svg>'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.mastercard { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 width="300px" height="180px" viewBox="0 0 300 180" style="enable-background:new 0 0 300 180;" xml:space="preserve">
<g id="layer1">
	<g id="g10305">
		<path id="path2268" style="fill:#FF9900;" d="M298.032,90.5c0.014,48.936-39.646,88.614-88.582,88.627
			c-48.937,0.012-88.614-39.646-88.627-88.582c0-0.016,0-0.029,0-0.045c-0.013-48.935,39.647-88.615,88.581-88.628
			c48.937-0.013,88.615,39.647,88.628,88.583C298.032,90.47,298.032,90.484,298.032,90.5z"/>
		<path id="path1350" style="fill:#CC0000;" d="M90.001,1.895C41.355,2.204,1.967,41.781,1.967,90.5
			c0,48.909,39.695,88.604,88.605,88.604c22.955,0,43.879-8.748,59.624-23.086c-0.001,0-0.003-0.002-0.007-0.004h0.019
			c3.224-2.938,6.231-6.108,8.995-9.488H141.05c-2.424-2.928-4.627-5.979-6.606-9.127h31.308c1.904-3.047,3.628-6.211,5.158-9.488
			h-41.635c-1.419-3.042-2.651-6.153-3.703-9.309h49.045c2.956-8.832,4.56-18.281,4.56-28.103c0-6.512-0.706-12.861-2.042-18.974
			h-54.164c0.671-3.146,1.518-6.254,2.528-9.308h49.063c-1.097-3.25-2.371-6.417-3.82-9.487H129.27
			c1.496-3.196,3.191-6.305,5.084-9.307h31.285c-2.082-3.317-4.386-6.486-6.877-9.488h-17.443c2.697-3.174,5.666-6.163,8.889-8.95
			c-15.746-14.34-36.676-23.09-59.636-23.09C90.381,1.895,90.192,1.894,90.001,1.895z"/>
		<path id="use9412" style="fill:#FCB340;" d="M289.143,136.82c0.482,0,0.951,0.125,1.409,0.371c0.46,0.246,0.814,0.601,1.07,1.062
			c0.256,0.456,0.384,0.937,0.384,1.435c0,0.492-0.127,0.968-0.379,1.424c-0.251,0.455-0.605,0.81-1.061,1.063
			c-0.451,0.249-0.928,0.375-1.424,0.375s-0.972-0.126-1.426-0.375c-0.455-0.254-0.807-0.607-1.063-1.063
			c-0.252-0.456-0.377-0.932-0.377-1.424c0-0.498,0.127-0.979,0.384-1.435c0.258-0.461,0.614-0.813,1.071-1.062
			C288.193,136.945,288.662,136.82,289.143,136.82 M289.143,137.295c-0.401,0-0.793,0.104-1.176,0.311
			c-0.38,0.207-0.677,0.5-0.891,0.888c-0.217,0.382-0.325,0.778-0.325,1.194c0,0.412,0.106,0.81,0.315,1.188
			c0.214,0.377,0.51,0.673,0.888,0.885c0.381,0.211,0.776,0.315,1.188,0.315c0.414,0,0.81-0.104,1.189-0.315
			c0.378-0.212,0.673-0.508,0.884-0.885c0.209-0.378,0.313-0.775,0.313-1.188c0-0.416-0.106-0.813-0.321-1.194
			c-0.213-0.388-0.511-0.681-0.894-0.888C289.934,137.398,289.544,137.295,289.143,137.295 M287.887,141.27v-3.082h1.062
			c0.36,0,0.622,0.028,0.784,0.088c0.162,0.057,0.291,0.154,0.388,0.297c0.095,0.141,0.144,0.291,0.144,0.451
			c0,0.226-0.08,0.422-0.242,0.588c-0.158,0.166-0.373,0.261-0.639,0.281c0.109,0.045,0.196,0.102,0.264,0.164
			c0.125,0.12,0.275,0.323,0.455,0.61l0.375,0.603h-0.606l-0.272-0.485c-0.215-0.382-0.388-0.62-0.521-0.718
			c-0.091-0.069-0.224-0.105-0.397-0.105h-0.293v1.311h-0.5 M288.385,139.535h0.604c0.288,0,0.483-0.044,0.588-0.129
			c0.106-0.088,0.159-0.2,0.159-0.342c0-0.092-0.024-0.174-0.075-0.244c-0.052-0.073-0.122-0.125-0.213-0.162
			c-0.089-0.035-0.255-0.055-0.497-0.055h-0.564v0.932"/>
	</g>
	<g id="g16480">
		<g id="g13802" transform="translate(-13.74405,15.9939)">
			<path id="path13804" style="fill:#000066;" d="M133.719,99.926l1.18-8.02c-0.645,0-1.593,0.279-2.431,0.279
				c-3.284,0-3.694-1.755-3.436-3.037l3.236-16.13h4.992l1.029-9.103h-4.705l0.958-5.516H124.7
				c-0.208,0.208-5.568,31.022-5.568,34.776c0,5.555,3.118,8.027,7.516,7.988C130.09,101.134,132.773,100.181,133.719,99.926z"/>
			<path id="path13806" style="fill:#000066;" d="M136.706,84.638c0,13.332,8.799,16.499,16.297,16.499
				c6.921,0,10.55-1.604,10.55-1.604l1.662-9.1c0,0-5.848,2.378-10.601,2.378c-10.131,0-8.355-7.554-8.355-7.554l19.463,0.059
				c0,0,1.239-6.111,1.239-8.602c0-6.217-3.387-13.849-13.745-13.849C143.73,62.867,136.706,73.088,136.706,84.638z M153.252,71.313
				c5.324,0,4.342,5.984,4.342,6.469H147.12C147.12,77.162,148.109,71.313,153.252,71.313z"/>
			<path id="path13808" style="fill:#000066;" d="M212.99,99.923l1.689-10.284c0,0-4.632,2.321-7.807,2.321
				c-6.693,0-9.378-5.11-9.378-10.601c0-11.137,5.758-17.265,12.168-17.265c4.808,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-4.554-3.289-9.456-3.308c-14.745-0.058-23.182,10.208-23.182,27.955c0,11.763,6.248,19.768,17.506,19.768
				C207.918,101.215,212.99,99.923,212.99,99.923z"/>
			<path id="path13810" style="fill:#000066;" d="M81.83,63.012c-6.469,0-11.427,2.079-11.427,2.079l-1.37,8.127
				c0,0,4.093-1.663,10.281-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.314,2.374-0.314,2.374s-2.772-0.231-4.056-0.231
				c-9.21,0-16.729,3.482-16.729,13.98c0,8.273,5.623,10.17,9.108,10.17c6.657,0,9.292-4.203,9.444-4.215l-0.077,3.488
				c0,0,8.306,0,8.307,0l3.706-25.98C94.786,63.366,85.17,63.012,81.83,63.012z M83.268,84.108c0.181,1.586-0.41,9.086-6.092,9.086
				c-2.93,0-3.691-2.24-3.691-3.562c0-2.584,1.403-5.683,8.315-5.683C83.41,83.949,82.997,84.065,83.268,84.108z"/>
			<path id="path13812" style="fill:#000066;" d="M103.615,100.906c2.125,0,14.272,0.541,14.272-11.994
				c0-11.721-11.244-9.404-11.244-14.114c0-2.342,1.833-3.08,5.184-3.08c1.329,0,6.447,0.423,6.447,0.423l1.189-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.802,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.287-5.844,3.287c-4.401,0-8.363-1.511-8.377-1.438l-1.259,8.245C93.257,99.819,95.702,100.906,103.615,100.906z"
				/>
			<path id="path13814" style="fill:#000066;" d="M290.807,55.455l-1.705,12.709c0,0-3.553-4.905-9.112-4.905
				c-10.459,0-15.849,10.423-15.849,22.396c0,7.73,3.844,15.307,11.699,15.307c5.651,0,8.784-3.941,8.784-3.941l-0.415,3.365h9.178
				l7.207-44.862L290.807,55.455z M286.755,80.156c0,4.983-2.468,11.64-7.581,11.64c-3.396,0-4.988-2.851-4.988-7.324
				c0-7.315,3.285-12.14,7.432-12.14C285.012,72.332,286.755,74.662,286.755,80.156z"/>
			<path id="path13816" style="fill:#000066;" d="M30.749,100.423l5.743-33.87l0.844,33.87h6.499l12.125-33.87l-5.371,33.87h9.658
				l7.437-44.922l-15.342-0.117l-9.126,27.504l-0.25-27.387h-14.06l-7.544,44.922H30.749L30.749,100.423z"/>
			<path id="path13818" style="fill:#000066;" d="M176.101,100.487c2.746-15.615,3.724-27.947,11.732-25.393
				c1.15-6.044,3.891-11.3,5.143-13.858c0,0-0.396-0.589-2.871-0.589c-4.225,0-9.866,8.574-9.866,8.574l0.843-5.301h-8.786
				l-5.884,36.566H176.101z"/>
			<g id="use14699" transform="translate(845.3001,0)">
				<path id="path13810_1_" style="fill:#000066;" d="M-612.55,63.012c-6.472,0-11.43,2.079-11.43,2.079l-1.369,8.127
					c0,0,4.095-1.663,10.28-1.663c3.514,0,6.083,0.395,6.083,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.231-4.055-0.231
					c-9.211,0-16.729,3.482-16.729,13.98c0,8.273,5.622,10.17,9.107,10.17c6.655,0,9.292-4.203,9.443-4.215l-0.078,3.488h8.309
					l3.705-25.98C-599.596,63.366-609.212,63.012-612.55,63.012z M-611.114,84.108c0.18,1.586-0.411,9.086-6.092,9.086
					c-2.932,0-3.692-2.24-3.692-3.562c0-2.584,1.402-5.683,8.315-5.683C-610.972,83.949-611.384,84.065-611.114,84.108z"/>
			</g>
			<path id="use14701" style="fill:#000066;" d="M255.266,100.487c1.508-11.488,4.299-27.616,11.731-25.393
				c1.149-6.044,0.041-6.028-2.433-6.028c-4.228,0-5.164,0.154-5.164,0.154l0.844-5.301h-8.785l-5.884,36.567H255.266
				L255.266,100.487z"/>
		</g>
		<g id="g10289">
			<path id="path4157" style="fill:#FFFFFF;" d="M122.434,113.059l1.181-8.019c-0.645,0-1.594,0.276-2.431,0.276
				c-3.284,0-3.646-1.746-3.437-3.037l2.653-16.362h4.991l1.205-8.87h-4.706l0.958-5.516h-9.434
				c-0.208,0.208-5.569,31.023-5.569,34.775c0,5.555,3.119,8.029,7.517,7.989C118.806,114.266,121.488,113.313,122.434,113.059z"/>
			<path id="path4155" style="fill:#FFFFFF;" d="M125.423,97.77c0,13.332,8.8,16.5,16.297,16.5c6.92,0,9.965-1.547,9.965-1.547
				l1.662-9.099c0,0-5.264,2.319-10.018,2.319c-10.13,0-8.356-7.553-8.356-7.553h19.172c0,0,1.238-6.113,1.238-8.604
				c0-6.216-3.094-13.79-13.452-13.79C132.445,75.998,125.423,86.219,125.423,97.77z M141.967,84.445
				c5.324,0,4.342,5.983,4.342,6.467h-10.474C135.835,90.294,136.825,84.445,141.967,84.445z"/>
			<path id="path4151" style="fill:#FFFFFF;" d="M201.707,113.055l1.688-10.285c0,0-4.629,2.321-7.806,2.321
				c-6.692,0-9.376-5.11-9.376-10.6c0-11.137,5.758-17.264,12.168-17.264c4.807,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-5.721-2.315-10.625-2.315c-10.891,0-21.486,9.448-21.486,27.192c0,11.766,5.721,19.537,16.979,19.537
				C196.637,114.348,201.707,113.055,201.707,113.055z"/>
			<path id="path4149" style="fill:#FFFFFF;" d="M70.547,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.369,8.127
				c0,0,4.093-1.663,10.28-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.315,2.374-0.315,2.374s-2.771-0.232-4.054-0.232
				c-8.159,0-16.73,3.482-16.73,13.98c0,8.272,5.623,10.17,9.108,10.17c6.656,0,9.525-4.319,9.678-4.332l-0.311,3.605h8.307
				l3.706-25.981C83.502,76.498,73.887,76.143,70.547,76.143z M72.568,97.297c0.18,1.587-0.995,9.026-6.675,9.026
				c-2.93,0-3.692-2.238-3.692-3.562c0-2.582,1.403-5.682,8.316-5.682C72.125,97.081,72.297,97.253,72.568,97.297z"/>
			<path id="path4145" style="fill:#FFFFFF;" d="M92.331,114.038c2.125,0,14.273,0.54,14.273-11.995
				c0-11.719-11.245-9.404-11.245-14.112c0-2.344,1.833-3.082,5.183-3.082c1.33,0,6.447,0.423,6.447,0.423l1.19-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.801,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.284-5.843,3.284c-4.401,0-8.364-1.51-8.378-1.438l-1.258,8.246C81.973,112.948,84.417,114.038,92.331,114.038z"/>
			<path id="path4139" style="fill:#FFFFFF;" d="M279.852,68.668l-2.035,12.627c0,0-3.551-4.905-9.11-4.905
				c-8.644,0-15.849,10.422-15.849,22.397c0,7.73,3.843,15.304,11.699,15.304c5.651,0,8.784-3.94,8.784-3.94l-0.415,3.365h9.176
				l7.207-44.863L279.852,68.668z M275.471,93.288c0,4.983-2.467,11.639-7.582,11.639c-3.395,0-4.986-2.85-4.986-7.323
				c0-7.314,3.285-12.14,7.43-12.14C273.729,85.463,275.471,87.796,275.471,93.288z"/>
			<path id="path4133" style="fill:#FFFFFF;" d="M19.466,113.555l5.743-33.87l0.843,33.87h6.5l12.125-33.87l-5.371,33.87h9.658
				l7.438-44.923H41.467l-9.301,27.563l-0.484-27.563H17.915l-7.545,44.923H19.466z"/>
			<path id="path4131" style="fill:#FFFFFF;" d="M164.818,113.617c2.746-15.616,3.255-28.296,9.808-25.975
				c1.147-6.044,2.254-8.382,3.506-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
				l-5.885,36.567H164.818z"/>
			<g id="use8523" transform="translate(847.0062,0)">
				<path id="path4149_1_" style="fill:#FFFFFF;" d="M-623.531,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.368,8.127
					c0,0,4.093-1.663,10.28-1.663c3.513,0,6.081,0.395,6.081,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.232-4.055-0.232
					c-8.158,0-16.729,3.482-16.729,13.98c0,8.272,5.622,10.17,9.107,10.17c6.656,0,9.525-4.319,9.677-4.332l-0.309,3.605
					c0,0,8.304,0,8.307,0l3.705-25.981C-610.575,76.498-620.191,76.143-623.531,76.143z M-621.507,97.297
					c0.18,1.587-0.996,9.026-6.678,9.026c-2.93,0-3.69-2.238-3.69-3.562c0-2.582,1.403-5.682,8.315-5.682
					C-621.952,97.081-621.781,97.253-621.507,97.297z"/>
			</g>
			<g id="use8525" transform="translate(442.2857,0)">
				<path id="path4131_1_" style="fill:#FFFFFF;" d="M-198.263,113.617c2.747-15.616,3.256-28.296,9.807-25.975
					c1.149-6.044,2.257-8.382,3.508-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
					l-5.885,36.567H-198.263z"/>
			</g>
			<path id="text9407" style="fill:#FFFFFF;" d="M289.105,107.975c0.479,0,0.951,0.123,1.406,0.373
				c0.459,0.242,0.816,0.598,1.072,1.059c0.257,0.458,0.383,0.935,0.383,1.434c0,0.493-0.126,0.969-0.379,1.424
				c-0.251,0.455-0.604,0.812-1.059,1.063c-0.454,0.25-0.93,0.376-1.424,0.376c-0.498,0-0.974-0.126-1.429-0.376
				c-0.454-0.253-0.806-0.608-1.058-1.063c-0.256-0.455-0.381-0.931-0.381-1.424c0-0.499,0.127-0.976,0.384-1.434
				c0.258-0.461,0.616-0.815,1.073-1.059C288.154,108.098,288.626,107.975,289.105,107.975 M289.105,108.447
				c-0.401,0-0.793,0.104-1.176,0.313c-0.382,0.204-0.679,0.499-0.894,0.885c-0.214,0.381-0.322,0.78-0.322,1.194
				s0.104,0.81,0.313,1.188c0.213,0.377,0.509,0.673,0.891,0.886c0.378,0.208,0.773,0.313,1.188,0.313
				c0.412,0,0.81-0.105,1.188-0.313c0.378-0.213,0.674-0.509,0.884-0.886c0.211-0.381,0.314-0.774,0.314-1.188
				s-0.107-0.813-0.321-1.194c-0.213-0.386-0.51-0.681-0.894-0.885C289.896,108.552,289.507,108.447,289.105,108.447
				 M287.85,112.423v-3.083h1.061c0.361,0,0.625,0.029,0.785,0.088c0.162,0.055,0.289,0.154,0.388,0.297
				c0.097,0.142,0.146,0.291,0.146,0.451c0,0.225-0.082,0.422-0.244,0.588c-0.158,0.166-0.371,0.262-0.637,0.28
				c0.106,0.046,0.194,0.101,0.262,0.163c0.123,0.122,0.275,0.326,0.455,0.611l0.377,0.604h-0.609l-0.271-0.485
				c-0.216-0.383-0.389-0.621-0.521-0.718c-0.091-0.071-0.224-0.106-0.399-0.106h-0.291v1.311L287.85,112.423 M288.348,110.688
				h0.604c0.289,0,0.484-0.043,0.588-0.129c0.105-0.084,0.16-0.199,0.16-0.342c0-0.091-0.025-0.173-0.075-0.242
				c-0.051-0.074-0.122-0.127-0.213-0.164c-0.091-0.035-0.254-0.053-0.498-0.053h-0.565V110.688"/>
		</g>
	</g>
</g>
</svg>
'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.discover { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" standalone="no"?><!-- no kidding around my files... (http://www.dodero.eu) --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg id="Untitled-Page%201" viewBox="0 0 1430 880" style="background-color:#ffffff00" version="1.1"	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"	x="0px" y="0px" width="1430px" height="880px">	<defs>		<radialGradient id="gradient1" cx="50.6977%" cy="50%" r="50%">			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>			<stop stop-color="#ff8000" stop-opacity="1" offset="100%"/>		</radialGradient>	</defs>	<g>		<rect x="0" y="-1" width="1430" height="880" fill="#ffffff"/>		<path d="M 1429.98 879.0058 L 357.3838 878.9818 C 507.3335 853.6667 738.6665 804.3334 1014.6665 711.6667 C 1290.6665 619 1415.3335 525.8333 1429.98 517.9085 L 1429.98 879.0058 Z" fill="#ff8000"/>		<g>			<path d="M 150.0288 399.6931 C 178.333 399.6931 200.3457 390.7787 216.0825 372.9343 C 231.8193 355.1056 239.6875 330.0635 239.6875 297.8238 C 239.6875 267.5213 232.2563 244.3376 217.4253 228.2572 C 202.5781 212.1924 181.2056 204.1443 153.3232 204.1443 L 75.8262 204.1443 L 75.8262 399.6931 L 150.0288 399.6931 L 150.0288 399.6931 ZM 113.7939 231.3598 L 136.2437 231.3598 C 150.5601 231.3598 161.457 232.9978 168.9507 236.258 C 176.4287 239.5182 182.8296 245.4244 188.1372 253.9765 C 195.8496 266.4188 199.7212 281.9795 199.7212 300.6587 C 199.7212 324.8188 194.9131 342.8365 185.2959 354.6961 C 175.6792 366.5556 161.0977 372.4775 141.5518 372.4775 L 113.7939 372.4775 L 113.7939 231.3598 L 113.7939 231.3598 Z" fill="#000000"/>			<path d="M 311.627 399.6931 L 311.627 204.1443 L 273.6587 204.1443 L 273.6587 399.6931 L 311.627 399.6931 L 311.627 399.6931 Z" fill="#000000"/>			<path d="M 391.2114 404.733 C 413.1304 404.733 430.3188 399.5829 442.793 389.251 C 455.251 378.9349 461.4956 364.6814 461.4956 346.5062 C 461.4956 333.7174 458.2017 322.8816 451.6138 313.9673 C 445.0254 305.0529 433.0513 295.3195 415.6597 284.7672 L 402.7485 276.9868 C 393.0693 271.0965 386.6216 266.1353 383.4058 262.1034 C 380.1738 258.0714 378.5659 253.378 378.5659 248.0231 C 378.5659 241.5342 381.0171 236.3053 385.9346 232.3048 C 390.8369 228.3202 397.3623 226.3199 405.5117 226.3199 C 416.0498 226.3199 430.3813 230.0211 448.5068 237.4078 L 448.5068 206.1603 C 430.5376 201.4668 414.395 199.1044 400.0791 199.1044 C 382.188 199.1044 367.7939 204.0025 356.9126 213.7989 C 346.0308 223.5952 340.5981 236.5573 340.5981 252.7007 C 340.5981 264.7966 343.9233 275.3489 350.5894 284.3893 C 357.2402 293.4296 368.6523 302.8637 384.8262 312.6758 L 396.894 319.9049 C 406.6357 325.8583 413.1772 331.0242 416.5181 335.3869 C 419.8594 339.7653 421.5298 345.1202 421.5298 351.4516 C 421.5298 359.484 418.7505 365.8469 413.1929 370.5088 C 407.6353 375.1865 400.0166 377.5175 390.3687 377.5175 C 376.5679 377.5175 359.9878 373.1548 340.5981 364.4137 L 340.5981 397.6771 C 359.8315 402.3706 376.6924 404.733 391.2114 404.733 L 391.2114 404.733 Z" fill="#000000"/>			<path d="M 628.5 360.5838 C 608.3164 370.0193 606.1743 376.725 586.3735 376.725 C 564.2754 376.725 547.0322 370.1138 534.6436 356.8914 C 522.2378 343.6691 516.0435 325.2556 516.0435 301.6195 C 516.0435 277.5731 521.7852 259.0018 533.3037 245.9057 C 544.8223 232.8096 561.1782 231.2706 582.3887 231.2706 C 598.9707 231.2706 601.7046 235.3099 626.2729 243.3885 L 626.2729 211.0742 C 604.188 204.579 600.623 201 578.6826 201 C 544.3008 201 517.853 207.9112 499.3047 225.7093 C 480.7568 243.5232 471.5 268.9581 471.5 301.9982 C 471.5 334.4387 480.7222 359.7158 499.1655 377.8295 C 517.6089 395.9431 543.3608 405 576.4204 405 C 603.4946 405 608.9604 400.9607 628.5 392.8821 L 628.5 360.5838 Z" fill="#000000"/>			<path d="M 971.1035 399.6931 L 1036.0176 204.1443 L 1004.8374 204.1443 L 954.583 355.4993 L 903.2515 204.1443 L 865.1602 204.1443 L 931.4795 399.6931 L 971.1035 399.6931 Z" fill="#000000"/>			<path d="M 1177.896 399.6931 L 1177.896 372.4775 L 1097.9634 372.4775 L 1097.9634 313.0065 L 1157.9131 313.0065 L 1157.9131 285.791 L 1097.9634 285.791 L 1097.9634 231.3598 L 1171.9009 231.3598 L 1171.9009 204.1443 L 1059.9956 204.1443 L 1059.9956 399.6931 L 1177.896 399.6931 L 1177.896 399.6931 Z" fill="#000000"/>			<path d="M 1242.8394 399.6931 L 1242.8394 320.0624 L 1263.0098 320.0624 L 1307.9092 399.6931 L 1353.7456 399.6931 L 1294.374 308.2816 C 1305.3804 303.0054 1314.0293 295.4141 1320.3208 285.5232 C 1326.6123 275.6324 1329.7656 264.6548 1329.7656 252.5905 C 1329.7656 220.3035 1311.5313 204.1443 1275.062 204.1443 L 1207.8691 204.1443 L 1207.8691 399.6931 L 1242.8394 399.6931 L 1242.8394 399.6931 ZM 1242.8394 231.3598 L 1255.7349 231.3598 C 1279.7769 231.3598 1291.7979 240.0222 1291.7979 257.3154 C 1291.7979 281.0031 1278.3252 292.8469 1251.3945 292.8469 L 1242.8394 292.8469 L 1242.8394 231.3598 L 1242.8394 231.3598 Z" fill="#000000"/>			<path id="Ellipse" d="M 645.5 302.5 C 645.5 243.1286 693.6284 195 753 195 C 812.3716 195 860.5 243.1286 860.5 302.5 C 860.5 361.8714 812.3716 410 753 410 C 693.6284 410 645.5 361.8714 645.5 302.5 Z" fill="url(#gradient1)"/>		</g>		<g>			<path d="M 437 524 L 437 479.0625 L 469.3438 524 L 481 524 L 481 458 L 470 458 L 470 502.9375 L 437.6563 458 L 426 458 L 426 524 L 437 524 L 437 524 Z" fill="#000000"/>			<path d="M 559.3999 524 L 559.3999 515 L 529.3999 515 L 529.3999 494 L 552.3999 494 L 552.3999 485 L 529.3999 485 L 529.3999 467 L 557.3999 467 L 557.3999 458 L 515.3999 458 L 515.3999 524 L 559.3999 524 L 559.3999 524 Z" fill="#000000"/>			<path d="M 619.7998 524 L 619.7998 467 L 643.7998 467 L 643.7998 458 L 581.7998 458 L 581.7998 467 L 605.7998 467 L 605.7998 524 L 619.7998 524 L 619.7998 524 Z" fill="#000000"/>			<path d="M 693.3408 524 L 703.7002 478.4063 L 713.2158 524 L 726.4971 524 L 744.2002 458 L 734.5439 458 L 721.7002 506.375 L 711.7158 458 L 699.6533 458 L 688.7002 506.6563 L 676.2783 458 L 663.2002 458 L 680.2158 524 L 693.3408 524 L 693.3408 524 Z" fill="#000000"/>			<path d="M 826.3813 514.8594 C 832.522 508.7656 835.6001 500.4375 835.6001 489.875 C 835.6001 479.5469 832.522 471.3125 826.3813 465.1875 C 820.2251 459.0625 811.9751 456 801.6157 456 C 791.1938 456 782.9126 459.0625 776.7876 465.1875 C 770.6626 471.3125 767.6001 479.5938 767.6001 490 C 767.6001 500.3125 770.647 508.5469 776.7407 514.7344 C 782.8345 520.9219 790.9751 524 801.1626 524 C 811.8188 524 820.2251 520.9531 826.3813 514.8594 L 826.3813 514.8594 ZM 787.022 508.1406 C 783.397 503.5625 781.6001 497.5156 781.6001 489.9844 C 781.6001 482.3906 783.4126 476.3281 787.0532 471.7969 C 790.6782 467.2656 795.5376 465 801.6313 465 C 807.6313 465 812.4595 467.2656 816.1157 471.7969 C 819.772 476.3281 821.6001 482.3438 821.6001 489.8438 C 821.6001 497.5781 819.772 503.7031 816.147 508.2188 C 812.5063 512.75 807.5688 515 801.3345 515 C 795.4126 515 790.647 512.7188 787.022 508.1406 L 787.022 508.1406 Z" fill="#000000"/>			<path d="M 880 524 L 880 497 L 886.3906 497 L 903.0938 524 L 920 524 L 898.2344 493.25 C 902.2031 491.4688 905.3125 488.8906 907.5938 485.5469 C 909.8594 482.2031 911 478.4844 911 474.3906 C 911 463.4688 904.2656 458 890.8125 458 L 866 458 L 866 524 L 880 524 L 880 524 ZM 880 467 L 884.4844 467 C 892.8281 467 897 469.9531 897 475.8594 C 897 483.9531 892.3125 488 882.9688 488 L 880 488 L 880 467 L 880 467 Z" fill="#000000"/>			<path d="M 961.3999 524 L 961.3999 491.5313 L 986.6655 524 L 1003.6499 524 L 975.2593 487.5156 L 997.6499 458 L 985.6812 458 L 961.3999 490 L 961.3999 458 L 947.3999 458 L 947.3999 524 L 961.3999 524 L 961.3999 524 Z" fill="#000000"/>		</g>	</g></svg>'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} \ No newline at end of file From 47463f49abf8a35bc4ef8f67be4816742d77505f Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Fri, 13 Jan 2017 17:26:48 -0600 Subject: [PATCH 005/158] CCN-239 - Improve Credit Card form UX --- ...myPaymentsCreditCard.create.modal.tpl.html | 33 ------------------- src/app/styles/components/glob.less | 1 + 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html index b64175d6..6473e773 100644 --- a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html +++ b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html @@ -1,36 +1,3 @@ -
diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index 9ce33069..d7663a90 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -18,3 +18,4 @@ @import '_topnav'; @import '_tree'; @import '_typeahead'; +@import '_creditcard'; From 2eaf2bd658136ff68204bdbf0be45c240e182d2e Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Fri, 13 Jan 2017 17:28:04 -0600 Subject: [PATCH 006/158] CCN-239 - Improve Credit Card form UX --- src/app/app.constants.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/app.constants.json b/src/app/app.constants.json index d6f332b9..ea190d0d 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,9 +1,9 @@ { - "appname": "CUPS Cafe Network", + "appname": "Angular Buyer", "scope": "FullAccess", - "clientid": "F286B844-C604-4081-9D22-F79EA176D8DC", - "buyerid": "cafebiba", - "catalogid": "defaultCupsCatalog", + "clientid": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX", + "buyerid": "XXXX", + "catalogid": "XXXX", "environment": "prod", "defaultstate": "home", "anonymous": false From 7221790ddfd4439692552e25600ce463d41320fe Mon Sep 17 00:00:00 2001 From: Steve Davis Date: Mon, 16 Jan 2017 11:16:31 -0600 Subject: [PATCH 007/158] CCN-239 - Improve Credit Card form UX --- .../myPaymentCreditCard.modalFactory.js | 6 +-- ...myPaymentsCreditCard.create.modal.tpl.html | 32 ++++++++++------ .../myPaymentsCreditCard.edit.modal.tpl.html | 37 ++++++++++++------- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/app/myPayments/myPaymentCreditCard.modalFactory.js b/src/app/myPayments/myPaymentCreditCard.modalFactory.js index 38156603..314a0868 100644 --- a/src/app/myPayments/myPaymentCreditCard.modalFactory.js +++ b/src/app/myPayments/myPaymentCreditCard.modalFactory.js @@ -49,8 +49,8 @@ function CreateCreditCardModalController($q, $exceptionHandler, $uibModalInstanc message: 'Creating Credit Card' }; - vm.creditCard.ExpirationMonth = vm.creditCard.ExpirationDate.split('/')[0]; - vm.creditCard.ExpirationYear = vm.creditCard.ExpirationDate.split('/')[1]; + // vm.creditCard.ExpirationMonth = vm.creditCard.ExpirationDate.split('/')[0]; + // vm.creditCard.ExpirationYear = vm.creditCard.ExpirationDate.split('/')[1]; vm.loading.promise = ocAuthNet.CreateCreditCard(vm.creditCard) .then(function(data){ @@ -69,7 +69,7 @@ function EditCreditCardModalController($q, $exceptionHandler, $uibModalInstance, var date = new Date(vm.creditCard.ExpirationDate); vm.creditCard.ExpirationMonth = (date.toISOString().substring(5,7)); vm.creditCard.ExpirationYear = date.getFullYear(); - vm.creditCard.ExpirationDate = date.getMonth() + "/" + date.getFullYear(); + //vm.creditCard.ExpirationDate = date.getMonth() + "/" + date.getFullYear(); vm.cancel = function() { $uibModalInstance.dismiss(); diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html index 6473e773..fb11beb7 100644 --- a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html +++ b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html @@ -26,17 +26,6 @@

New Credit Card

ng-class="createCreditCard.creditCard.CardType" disable-validation-message=""/>
-
-
- - -
-
@@ -51,6 +40,27 @@

New Credit Card

+
+
+ + +
+
+ + +
diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html index e01f0651..6ea6e115 100644 --- a/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html +++ b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html @@ -24,21 +24,10 @@

Edit your ng-model="editCreditCard.creditCard.CardNumber" payments-validate="card" payments-format="card" - payments-type-model="creditCard.CardType" - ng-class="creditCard.CardType" + payments-type-model="editCreditCard.creditCard.CardType" + ng-class="editCreditCard.creditCard.CardType" disable-validation-message=""/>

-
-
- - -
-
@@ -53,6 +42,28 @@

Edit your

+
+
+ + +
+
+ + +
+
From 8489a9d87706206c1de8529e5f66ab0625cdf0fb Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood Date: Wed, 18 Jan 2017 12:41:09 -0600 Subject: [PATCH 008/158] [CCN-109] Write Unit test for AuthNet Service add expiration date format function to oc-creditcard-utility --- src/app/common/services/oc-authnet.js | 38 +++--- .../common/services/oc-creditcard-utility.js | 16 ++- src/app/common/tests/oc-authnet.spec.js | 111 ++++++++++++++++++ 3 files changed, 141 insertions(+), 24 deletions(-) create mode 100644 src/app/common/tests/oc-authnet.spec.js diff --git a/src/app/common/services/oc-authnet.js b/src/app/common/services/oc-authnet.js index aea453e3..bc549e6f 100644 --- a/src/app/common/services/oc-authnet.js +++ b/src/app/common/services/oc-authnet.js @@ -2,22 +2,23 @@ angular.module('orderCloud') .factory('ocAuthNet', AuthorizeNet) ; -function AuthorizeNet( $q, $resource, OrderCloud) { +function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { return { 'CreateCreditCard': _createCreateCard, 'UpdateCreditCard': _updateCreditCard, - 'DeleteCreditCard' : _deleteCreditCard - // 'AuthAndCapture' : _authAndCapture + 'DeleteCreditCard' : _deleteCreditCard, + 'MakeAuthnetCall' : _makeApiCall }; +//if I want to check that the expiration data is formatted correctly. I could make a function that does what it needs to , return it in service then i can check that the functionality works + //check the api call, make sure it gets sent to the right url and it passes the body that I expect it too - function _createCreateCard(creditCard, buyerID) { - var year = creditCard.ExpirationYear.toString().substring(2,4); - var ExpirationDate = creditCard.ExpirationMonth.concat(year); - return makeApiCall('POST',{ + function _createCreateCard(creditCard, buyerID) { + var ExpirationDate = ocCreditCardUtility.ExpirationDateFormat(creditCard.ExpirationMonth, creditCard.ExpirationYear); + return _makeApiCall('POST', { 'buyerID' : buyerID ? buyerID : OrderCloud.BuyerID.Get(), - 'TransactionType' : "createCreditCard", + 'TransactionType' : 'createCreditCard', 'CardDetails' : { 'CardholderName' : creditCard.CardholderName, 'CardType' : creditCard.CardType, @@ -29,12 +30,10 @@ function AuthorizeNet( $q, $resource, OrderCloud) { } function _updateCreditCard(creditCard, buyerID) { - var year = creditCard.ExpirationYear.toString().substring(2,4); - var ExpirationDate = creditCard.ExpirationMonth.concat(year); - - return makeApiCall('POST',{ + var ExpirationDate = ocCreditCardUtility.ExpirationDateFormat(creditCard.ExpirationMonth, creditCard.ExpirationYear); + return _makeApiCall('POST', { 'buyerID' : buyerID ? buyerID : OrderCloud.BuyerID.Get(), - 'TransactionType' : "updateCreditCard", + 'TransactionType' : 'updateCreditCard', 'CardDetails' : { 'CreditCardID' : creditCard.ID, 'CardholderName' : creditCard.CardholderName, @@ -46,22 +45,17 @@ function AuthorizeNet( $q, $resource, OrderCloud) { } function _deleteCreditCard(creditCard, buyerID) { - return makeApiCall('POST', { + return _makeApiCall('POST', { 'buyerID': buyerID ? buyerID : OrderCloud.BuyerID.Get(), - 'TransactionType': "deleteCreditCard", + 'TransactionType': 'deleteCreditCard', 'CardDetails': { 'CreditCardID': creditCard.ID } }); - } - // function _authAndCapture() { - // - // } - - function makeApiCall(method, requestBody) { - var apiUrl = 'https://api.ordercloud.io/v1/integrationproxy/authorizenettest'; + function _makeApiCall(method, requestBody) { + var apiUrl = apiurl +'/v1/integrationproxy/authorizenettest'; var d = $q.defer(); $resource(apiUrl, null, { callApi: { diff --git a/src/app/common/services/oc-creditcard-utility.js b/src/app/common/services/oc-creditcard-utility.js index 36a90833..ecf0457b 100644 --- a/src/app/common/services/oc-creditcard-utility.js +++ b/src/app/common/services/oc-creditcard-utility.js @@ -2,8 +2,10 @@ angular.module('orderCloud') .factory('ocCreditCardUtility', CreditCardUtility) ; - +// also check out fa-creditCard.js filter under the common folder function CreditCardUtility() { + var ExpirationDate; + var Year; //return the expirationMonth array and its function var creditCardUtility = { ExpirationMonths: [{ @@ -52,8 +54,18 @@ function CreditCardUtility() { 'American Express', 'Discover', 'Visa' - ] + ], + // expects month as two digit string and year as a number, then converts and concats to 'XX/XXXX' string format + ExpirationDateFormat: function ExpirationDateFormat(month, year){ + ExpirationDate = month.concat(convertYearToString(year)); + return ExpirationDate; + } }; + //expects number and converts to string example: 2018 to '2018' + function convertYearToString (year){ + Year = year.toString().substring(2, 4); + return Year; + } function _ccExpireYears() { var today = new Date(); diff --git a/src/app/common/tests/oc-authnet.spec.js b/src/app/common/tests/oc-authnet.spec.js new file mode 100644 index 00000000..93c73037 --- /dev/null +++ b/src/app/common/tests/oc-authnet.spec.js @@ -0,0 +1,111 @@ +fdescribe('Factory: oc-authnet', function(){ + var scope, + q, + oc, + api, + resource, + ocAuthNetService, + ccUtility, + mockCreditCard, + mockBuyerID, + AuthnetMockCC, + mockReturnedCC + ; + beforeEach(module('orderCloud')); + beforeEach(inject(function ($rootScope, $q, $resource, OrderCloud, apiurl, ocAuthNet, ocCreditCardUtility) { + scope = $rootScope.$new(); + q = $q; + oc = OrderCloud; + api = apiurl; + resource = $resource; + ocAuthNetService = ocAuthNet; + ccUtility = ocCreditCardUtility; + mockCreditCard = { + ID: 'testCompanyACard', + Editable: true, + Token: null, + DateCreated: '2016-12-07T17:49:28.73+00:00', + CardType: 'visa', + PartialAccountNumber: '123', + CardholderName: 'CompanyA', + ExpirationMonth: '01', + ExpirationYear: 2018, + xp: null + }; + mockBuyerID = 'fakeID'; + AuthnetMockCC = { + 'buyerID': 'buyerID', + 'TransactionType': 'createCreditCard', + 'CardDetails': { + 'CardholderName': 'CompanyA', + 'CardType': 'visa', + 'CardNumber': 1234567891234567, + 'ExpirationDate': '01/2018', + 'CardCode': '123' + } + }; + mockReturnedCC = { + 'ID': 'testCompanyACard', + 'Editable': true, + 'Token': null, + 'DateCreated': '2016-12-07T17:49:28.73+00:00', + 'CardType': 'visa', + 'PartialAccountNumber': '123', + 'CardholderName': 'CompanyA', + 'ExpirationDate': '2016-02-20T00:00:00+00:00', + 'xp': null + }; + })); + + describe('CreateCreditCard', function(){ + beforeEach(function(){ + spyOn(ccUtility, 'ExpirationDateFormat'); + spyOn(oc.BuyerID, 'Get'); + }); + it('should call ocCreditCardUtility ExpirationDateFormat method ', function(){ + ocAuthNetService.CreateCreditCard(mockCreditCard, mockBuyerID ); + expect(ccUtility.ExpirationDateFormat).toHaveBeenCalledWith('01', 2018); + }); + it('should call OrderCloud.BuyerID Get method, when no buyerID is passed ', function(){ + ocAuthNetService.CreateCreditCard(mockCreditCard, null ); + expect(oc.BuyerID.Get).toHaveBeenCalled(); + }); + }); + + describe('UpdateCreditCard', function(){ + beforeEach(function(){ + spyOn(ccUtility, 'ExpirationDateFormat'); + spyOn(oc.BuyerID, 'Get'); + }); + it('should call ocCreditCardUtility ExpirationDateFormat method ', function(){ + ocAuthNetService.UpdateCreditCard(mockCreditCard, mockBuyerID ); + expect(ccUtility.ExpirationDateFormat).toHaveBeenCalledWith('01', 2018); + }); + it('should call OrderCloud.BuyerID Get method, when no buyerID is passed ', function(){ + ocAuthNetService.UpdateCreditCard(mockCreditCard, null ); + expect(oc.BuyerID.Get).toHaveBeenCalled(); + }); + }); + + describe('DeleteCreditCard', function(){ + beforeEach(function(){ + spyOn(oc.BuyerID, 'Get'); + }); + it('should call OrderCloud.BuyerID Get method, when no buyerID is passed ', function(){ + ocAuthNetService.DeleteCreditCard(mockCreditCard, null ); + expect(oc.BuyerID.Get).toHaveBeenCalled(); + }); + }); + + describe('MakeAuthnetCall', function(){ + beforeEach(function(){ + var defer = q.defer(); + defer.resolve(); + spyOn(oc.Auth, 'ReadToken').and.returnValue(defer.promise); + ocAuthNetService.MakeAuthnetCall('POST', AuthnetMockCC ); + }); + it('should call OrderCloud.Auth ReadToken method ', function(){ + expect(oc.Auth.ReadToken).toHaveBeenCalled(); + }); + }); +}); \ No newline at end of file From ac434000989930546d39a0795f7508efa3245c05 Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood Date: Wed, 18 Jan 2017 12:47:54 -0600 Subject: [PATCH 009/158] CCN-109 take out f in describe --- src/app/common/tests/oc-authnet.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/common/tests/oc-authnet.spec.js b/src/app/common/tests/oc-authnet.spec.js index 93c73037..c9757f99 100644 --- a/src/app/common/tests/oc-authnet.spec.js +++ b/src/app/common/tests/oc-authnet.spec.js @@ -1,4 +1,4 @@ -fdescribe('Factory: oc-authnet', function(){ +describe('Factory: oc-authnet', function(){ var scope, q, oc, From 153ee517396819f995c68774edce70996c58ac45 Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood Date: Wed, 18 Jan 2017 12:49:02 -0600 Subject: [PATCH 010/158] remove comments --- src/app/common/services/oc-authnet.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/common/services/oc-authnet.js b/src/app/common/services/oc-authnet.js index bc549e6f..6ad5f691 100644 --- a/src/app/common/services/oc-authnet.js +++ b/src/app/common/services/oc-authnet.js @@ -10,9 +10,6 @@ function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { 'MakeAuthnetCall' : _makeApiCall }; -//if I want to check that the expiration data is formatted correctly. I could make a function that does what it needs to , return it in service then i can check that the functionality works - //check the api call, make sure it gets sent to the right url and it passes the body that I expect it too - function _createCreateCard(creditCard, buyerID) { var ExpirationDate = ocCreditCardUtility.ExpirationDateFormat(creditCard.ExpirationMonth, creditCard.ExpirationYear); From 3115e6d7919add5694f970e44fff5b428e237095 Mon Sep 17 00:00:00 2001 From: Aisha Ragheb Date: Wed, 18 Jan 2017 17:45:10 -0600 Subject: [PATCH 011/158] adding styles to product list --- src/app/common/templates/card.product.tpl.html | 4 ++-- src/app/styles/layout/_catalog-grid.less | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.tpl.html index c32eb9d0..a3879664 100644 --- a/src/app/common/templates/card.product.tpl.html +++ b/src/app/common/templates/card.product.tpl.html @@ -5,9 +5,9 @@ {{product.ID}} {{product.StandardPriceSchedule.PriceBreaks[0].Price | currency}} x {{product.StandardPriceSchedule.PriceBreaks[0].Quantity}}
-

{{product.Name || product.ID}}

+

{{product.Name || product.ID}}

-

{{product.Description}}

+

{{product.Description | limitTo: 40}}{{product.Description.length > 40 ? '...' : ''}}

diff --git a/src/app/styles/layout/_catalog-grid.less b/src/app/styles/layout/_catalog-grid.less index 4ebd55bd..fe8e73b6 100644 --- a/src/app/styles/layout/_catalog-grid.less +++ b/src/app/styles/layout/_catalog-grid.less @@ -1,12 +1,14 @@ .l-product-grid { // use flexbox for layout on small+ screens // add flex display to product grid wrapper + margin: 0 -5px; @media (min-width: @screen-sm-min) { .oc-flex-layout.horizontal; .oc-flex-layout.wrap; // flex each item within the grid wrapper &__item { .oc-flex-layout.vertical; + padding: 0 5px; } } } From 1e3c3487821de0ea39ff823bbbf4739dbe4ee217 Mon Sep 17 00:00:00 2001 From: Aisha Ragheb Date: Wed, 18 Jan 2017 17:49:16 -0600 Subject: [PATCH 012/158] adding ellipsis to product ID if over 10 characters --- src/app/common/templates/card.product.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.tpl.html index a3879664..c8e99894 100644 --- a/src/app/common/templates/card.product.tpl.html +++ b/src/app/common/templates/card.product.tpl.html @@ -2,7 +2,7 @@
- {{product.ID}} + {{product.ID | limitTo: 10}}{{product.ID.length > 10 ? '...' : ''}} {{product.StandardPriceSchedule.PriceBreaks[0].Price | currency}} x {{product.StandardPriceSchedule.PriceBreaks[0].Quantity}}

{{product.Name || product.ID}}

From 325119d44471e02161994fe01a12f6d824e2cd2b Mon Sep 17 00:00:00 2001 From: Aisha Ragheb Date: Thu, 19 Jan 2017 17:17:14 -0600 Subject: [PATCH 013/158] needing to override specific margin directions --- src/app/styles/layout/_catalog-grid.less | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/styles/layout/_catalog-grid.less b/src/app/styles/layout/_catalog-grid.less index fe8e73b6..7f2564ef 100644 --- a/src/app/styles/layout/_catalog-grid.less +++ b/src/app/styles/layout/_catalog-grid.less @@ -1,14 +1,16 @@ .l-product-grid { // use flexbox for layout on small+ screens // add flex display to product grid wrapper - margin: 0 -5px; + margin-left: -5px; + margin-right: -5px; @media (min-width: @screen-sm-min) { .oc-flex-layout.horizontal; .oc-flex-layout.wrap; // flex each item within the grid wrapper &__item { .oc-flex-layout.vertical; - padding: 0 5px; + padding-left: @grid-gutter-width/6; + padding-right: @grid-gutter-width/6; } } } From 7fea94c5bb28746e09b33f37ce8346b637b805c1 Mon Sep 17 00:00:00 2001 From: Aisha Ragheb Date: Mon, 23 Jan 2017 13:46:38 -0600 Subject: [PATCH 014/158] possible changes for styling --- .../common/templates/card.product.tpl.html | 8 ++++---- .../templates/productView.tpl.html | 2 +- src/app/styles/layout/_catalog-grid.less | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.tpl.html index c8e99894..bcdc2824 100644 --- a/src/app/common/templates/card.product.tpl.html +++ b/src/app/common/templates/card.product.tpl.html @@ -2,14 +2,14 @@
- {{product.ID | limitTo: 10}}{{product.ID.length > 10 ? '...' : ''}} + {{product.ID | limitTo: 8}}{{product.ID.length > 8 ? '...' : ''}} {{product.StandardPriceSchedule.PriceBreaks[0].Price | currency}} x {{product.StandardPriceSchedule.PriceBreaks[0].Quantity}}
-

{{product.Name || product.ID}}

-
+

{{product.Name || product.ID}}

+ -
+ diff --git a/src/app/productBrowse/templates/productView.tpl.html b/src/app/productBrowse/templates/productView.tpl.html index ce4f91d0..22e3e4af 100644 --- a/src/app/productBrowse/templates/productView.tpl.html +++ b/src/app/productBrowse/templates/productView.tpl.html @@ -36,7 +36,7 @@
{{(application.$ocMedia('min-width:768px') ? productVie
-
diff --git a/src/app/styles/layout/_catalog-grid.less b/src/app/styles/layout/_catalog-grid.less index 7f2564ef..ff268f15 100644 --- a/src/app/styles/layout/_catalog-grid.less +++ b/src/app/styles/layout/_catalog-grid.less @@ -13,6 +13,25 @@ padding-right: @grid-gutter-width/6; } } + @media (max-width: @screen-xs-max){ + .thumbnail { + border: none; + } + .oc-flex-layout.horizontal; + .oc-flex-layout.wrap; + // flex each item within the grid wrapper + &__item { + .oc-flex-layout.vertical; + padding-left: 2px; + padding-right: 2px; + body, p{ + font-size: 10px; + } + h4{ + font-size: 12px; + } + } + } } .l-category-grid { // use flexbox for layout on small+ screens From ce638f047c0c66f98da9d677700e88b623912ede Mon Sep 17 00:00:00 2001 From: Robert Watt Date: Thu, 26 Jan 2017 12:17:35 -0600 Subject: [PATCH 015/158] Update gulp tasks Build & compile now account for bootswatch themes; there is a new app.constants.json variable for controlling in a dev environment. Use env vars in heroku for deployments. --- bower.json | 3 ++- gulp.config.js | 19 ++++++++++++++++++- gulp/build/styles.js | 16 ++++++++++++---- gulp/compile/app-css.js | 6 +++++- gulp/serve.js | 6 +++++- src/app/app.constants.json | 3 ++- 6 files changed, 44 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index efa9a2cc..36b62c3e 100644 --- a/bower.json +++ b/bower.json @@ -42,7 +42,8 @@ "angular-tree-control": "^0.2.28", "angular-sticky": "angular-sticky-plugin#^0.3.0", "angular-busy2": "^5.2.0", - "angular-payments": "*" + "angular-payments": "*", + "bootswatch": "^3.3.7" }, "devDependencies": { "angular-mocks": "^1.6.0" diff --git a/gulp.config.js b/gulp.config.js index 49f24858..7c703f0b 100644 --- a/gulp.config.js +++ b/gulp.config.js @@ -63,7 +63,8 @@ module.exports = { cascade: true }, jsCache: 'jsscripts', - indentSize: 4 + indentSize: 4, + checkBootswatchTheme: _checkBootswatchTheme }; function getConstants() { @@ -104,3 +105,19 @@ function getConstants() { if (process.env.catalogid) result.catalogid = process.env.catalogid; return result; } + +function _checkBootswatchTheme() { + var bootswatchBower = {}; + var constants = JSON.parse(fs.readFileSync(source + 'app/app.constants.json')); + + var theme = process.env.bootswatchtheme || constants.bootswatchtheme; + + if (theme) { + bootswatchBower.main = [ + "./" + theme + "/bootswatch.less", + "./" + theme + "/variables.less" + ] + } + + return bootswatchBower; +} diff --git a/gulp/build/styles.js b/gulp/build/styles.js index 7aee7fc8..6cfda9eb 100644 --- a/gulp/build/styles.js +++ b/gulp/build/styles.js @@ -1,6 +1,5 @@ var gulp = require('gulp'), config = require('../../gulp.config'), - browserSync = require('browser-sync').get('oc-server'), del = require('del'), less = require('gulp-less'), autoprefixer = require('gulp-autoprefixer'), @@ -14,10 +13,17 @@ gulp.task('clean:styles', function() { return del(config.build + '**/*.css'); }); -gulp.task('styles', ['clean:styles'], function() { +gulp.task('styles', ['clean:styles'], StylesFunction); + +function StylesFunction() { + var browserSync = require('browser-sync').get('oc-server'); return gulp .src([].concat( - mainBowerFiles({filter: '**/*.less'}), + mainBowerFiles({ + filter: '**/*.less', + overrides: { + 'bootswatch': config.checkBootswatchTheme() + }}), './src/app/styles/main.less' )) .pipe(sourcemaps.init()) @@ -28,4 +34,6 @@ gulp.task('styles', ['clean:styles'], function() { .pipe(sourcemaps.write('../maps')) .pipe(gulp.dest(config.build + config.appCss)) .pipe(browserSync.stream()); -}); +} + +module.exports = StylesFunction; \ No newline at end of file diff --git a/gulp/compile/app-css.js b/gulp/compile/app-css.js index a2bce53e..641c3c11 100644 --- a/gulp/compile/app-css.js +++ b/gulp/compile/app-css.js @@ -20,7 +20,11 @@ gulp.task('app-css', ['clean:app-css'], function() { return gulp .src([].concat( - mainBowerFiles({filter: ['**/*.css', '**/*.less']}), + mainBowerFiles({ + filter: ['**/*.css', '**/*.less'], + overrides: { + 'bootswatch': config.checkBootswatchTheme() + }}), './src/app/styles/main.less' )) .pipe(lessFilter) diff --git a/gulp/serve.js b/gulp/serve.js index 91aee679..0cbcba51 100644 --- a/gulp/serve.js +++ b/gulp/serve.js @@ -4,6 +4,7 @@ var nodemon = require('gulp-nodemon'), gulp = require('gulp'), config = require('../gulp.config'), + styles = require('./build/styles'), cache = require('gulp-cached'), browserSync = require('browser-sync').create('oc-server'), port = process.env.PORT || 7203; @@ -41,7 +42,10 @@ config.styles ), ['styles']); gulp.watch(config.src + '**/app.constants.json', ['app-config']) - .on('change', browserSync.reload); + .on('change', function() { + styles(); + return browserSync.reload; + }); } return nodemon ({ script: './server.js', diff --git a/src/app/app.constants.json b/src/app/app.constants.json index ea190d0d..adf197b8 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -6,5 +6,6 @@ "catalogid": "XXXX", "environment": "prod", "defaultstate": "home", - "anonymous": false + "anonymous": false, + "bootswatchtheme": null } \ No newline at end of file From 11bb4749e40f971b8eccfa979db62e0477e702f8 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez Date: Mon, 13 Feb 2017 14:09:09 -0600 Subject: [PATCH 016/158] OC-1988 fix bug where images not showing on cart. --- src/app/cart/templates/cart.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/cart/templates/cart.tpl.html b/src/app/cart/templates/cart.tpl.html index f35a10b4..99eaa0b4 100644 --- a/src/app/cart/templates/cart.tpl.html +++ b/src/app/cart/templates/cart.tpl.html @@ -61,7 +61,7 @@
- {{lineItem.Product.xp.image.Name || 'Product Image'}}
From 8a7f7f953b3efac3c48b7ba6df743fe84d7706f3 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez Date: Mon, 13 Feb 2017 15:32:21 -0600 Subject: [PATCH 017/158] OC-1988 expose category browse for demos --- src/app/base/templates/navigation.tpl.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/base/templates/navigation.tpl.html b/src/app/base/templates/navigation.tpl.html index beb1ffc1..608e8c95 100644 --- a/src/app/base/templates/navigation.tpl.html +++ b/src/app/base/templates/navigation.tpl.html @@ -9,7 +9,10 @@
- + +
+
+
-
+

Shipping Method

From 4c23175e457c4fc19407bf6ecbdfa680acd2e526 Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood Date: Wed, 15 Feb 2017 11:46:15 -0600 Subject: [PATCH 019/158] update category browser to navigate correctly when hitting link --- src/app/base/templates/navigation.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/base/templates/navigation.tpl.html b/src/app/base/templates/navigation.tpl.html index 608e8c95..76898948 100644 --- a/src/app/base/templates/navigation.tpl.html +++ b/src/app/base/templates/navigation.tpl.html @@ -12,7 +12,7 @@
- +
From e818a25a0939d3072922b7e1edf326218944bfc0 Mon Sep 17 00:00:00 2001 From: Robert Watt Date: Fri, 10 Mar 2017 15:28:51 -0600 Subject: [PATCH 026/158] Add "Buyer" to login header to facilitate app type recognition --- src/app/login/templates/login.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/login/templates/login.tpl.html b/src/app/login/templates/login.tpl.html index ef74c8c3..bbed304f 100644 --- a/src/app/login/templates/login.tpl.html +++ b/src/app/login/templates/login.tpl.html @@ -4,7 +4,7 @@
-

Login

+

Buyer Login

From 547637637868b724a6c80e4d0fd6ba0536a63046 Mon Sep 17 00:00:00 2001 From: Robert Watt Date: Fri, 10 Mar 2017 15:33:10 -0600 Subject: [PATCH 027/158] Update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1e87fcf9..ba4293a4 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ node_modules/ bower_components/ errorShots/ .idea -plato/ \ No newline at end of file +plato/ +.publish/ \ No newline at end of file From 3242d1425e54a6553a23b13e6bd6362f0c99c48a Mon Sep 17 00:00:00 2001 From: Robert Watt Date: Fri, 10 Mar 2017 15:36:11 -0600 Subject: [PATCH 028/158] Add gulp-deploy task --- gulp/compile/deploy.js | 23 +++++++++++++++++++++++ package.json | 3 +++ 2 files changed, 26 insertions(+) create mode 100644 gulp/compile/deploy.js diff --git a/gulp/compile/deploy.js b/gulp/compile/deploy.js new file mode 100644 index 00000000..8ad3cba4 --- /dev/null +++ b/gulp/compile/deploy.js @@ -0,0 +1,23 @@ +var gulp = require('gulp'), + ghPages = require('gulp-gh-pages'), + htmlReplace = require('gulp-html-replace'), + repoName = require('git-repo-name'), + config = require('../../gulp.config'); + +gulp.task('deploy', ['href'], function() { + return gulp.src(config.compile + "**/*") + .pipe(ghPages({ + force: true + })) +}); + +gulp.task('href', ['index'], function() { + return gulp.src(config.compile + 'index.html') + .pipe(htmlReplace({ + 'href': { + src: repoName.sync(), + tpl: '' + } + })) + .pipe(gulp.dest(config.compile)) +}); \ No newline at end of file diff --git a/package.json b/package.json index a0e2d93e..e542406e 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "del": "2.2.0", "express": "4.13.4", "fs": "0.0.2", + "git-repo-name": "0.6.0", "gulp-angular-filesort": "1.1.1", "gulp-angular-templatecache": "1.8.0", "gulp-autoprefixer": "3.1.0", @@ -50,6 +51,8 @@ "gulp-csso": "1.0.1", "gulp-filter": "3.0.1", "gulp-flatten": "0.2.0", + "gulp-gh-pages": "0.5.4", + "gulp-html-replace": "1.6.2", "gulp-htmlmin": "1.3.0", "gulp-imagemin": "2.4.0", "gulp-inject": "3.0.0", From 1d467afcbe22f0aff27a8047cdc57baae7e05f04 Mon Sep 17 00:00:00 2001 From: Robert Watt Date: Fri, 10 Mar 2017 16:55:35 -0600 Subject: [PATCH 029/158] Adding README files --- README.md | 205 ++++++++++++++++------------------------ src/README.md | 74 ++++++++------- src/app/login/README.md | 0 3 files changed, 119 insertions(+), 160 deletions(-) create mode 100644 src/app/login/README.md diff --git a/README.md b/README.md index 75f85054..0a9630ec 100644 --- a/README.md +++ b/README.md @@ -1,153 +1,106 @@ -# OrderCloud Seed - AngularJS -A seed project for custom Four51 Solutions built on AngularJS -*** +| master | development | +| --- | --- | +| [![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=master)](https://travis-ci.org/ordercloud-api/angular-buyer) | [![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=development)](https://travis-ci.org/ordercloud-api/angular-buyer) | -## Build Status -### development -[![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=development)](https://travis-ci.org/ordercloud-api/angular-buyer) -### master -[![Build Status](https://travis-ci.org/ordercloud-api/angular-buyer.svg?branch=master)](https://travis-ci.org/ordercloud-api/angular-buyer) +# OrderCloud Angular Buyer +An open-source starter application for custom OrderCloud buyer applications built on AngularJS. Ideally, solution +implementers will fork or clone this repository to maintain their customized version of the buyer application through merges and +pull requests after new versions are released in the base fork (this repository). -## Get started +- [Getting Started](#getting-started) +- [Contributors](#contributors) +- [Further Reading](#further-reading) -Node.js is required for the following node package manager (npm) tasks. If you don't have node.js installed, you can download it [here](http://nodejs.org/). +- - - - -```sh - -$ npm install -$ gulp build -``` - -You should now have a few more directories in your project. - -``` -OrderCloud/ - |- build/ - |- node_modules/ - |- bower_components/ -``` - -## Configure WebStorm -WebStorm is our chosen development IDE. It provides an interface for the capabilities of the seed projects configuration. - -### Karma Unit Testing -Once you've installed the prerequisites and run your gulp build you can setup and run your Karma tests. - -Create a Run configuration using the Karma plugin with the following settings: - -Node interpreter: C:\Program Files (x86)\nodejs\node.exe - -Karma package: C:\Four51\WebFiles\SPASites\defaults\OrderCloud\node_modules\karma - -Configuration file: C:\Four51\WebFiles\SPASites\defaults\OrderCloud\build\karma-unit.js - - -### Overall Directory Structure - -At a high level, the structure looks roughly like this: - -``` -OrderCloud/ - |- gulp/ - |- node_modules/ - |- src/ - | |- app/ - | | |- - | |- assets/ - | | |- - | |- index.html - |- bower_components/ - | |- - |- bower.json - |- gulp.config.js - |- gulpfile.js - |- server.js - |- package.json -``` +## Getting started -### Detailed Installation - -This section provides a little more detailed understanding of what goes into -getting `OrderCloud` up and running. Though `OrderCloud` is really simple -to use, it might help to have an understanding of the tools involved here, like -Node.js and Gulp and Bower. If you're completely new to highly organized, -modern JavaScript development, take a few short minutes to read [this overview -of the tools](tools.md) before continuing with this section. - -Here it is: - -`OrderCloud` uses [Gulp](http://gulpjs.com/) as its build system, so -[Node.js](http://nodejs.org) is required. - -Install the build dependencies locally: +### Prerequisites +- [Git (version control)](https://git-scm.com/) +- [Node.js (npm)](http://nodejs.org/) +- [Bower (another package manager)](https://bower.io/#install-bower) +- [Gulp.js (automation)](http://gulpjs.com/) +### Installation +Install the project dependencies: ```sh $ npm install ``` - -This will read the `dependencies` (empty by default) and the `devDependencies` -(which contains our build requirements) from `package.json` and install -everything needed into a folder called `node_modules/`. - -There are many Bower packages used by `OrderCloud`, like AngularJS and the -OrderCloud-Angular-SDK, which are listed in `bower.js`. To install them into the -`vendor/` directory, simply run: - -**This is already installed after running $ npm install - +If for some reason the `post-install` script fails, reattempt the bower install manually: ```sh $ bower install ``` -In the future, should you want to add a new Bower package to your app, run the -`install` command and add `--save` to save the dependency in your bower.json file: - +### Local Development +To view your application locally while you work, run the following gulp command: +```sh +$ gulp build +``` +This will pull together everything in the projects `./src/` directory and put the result into a new `./build/` folder +(ignored by source control). + +After the build succeeds, an express server will fire up and open the app in your default browser @ `http://localhost:3000/`. +Additionally, a watch is initiated so that [BrowserSync](https://browsersync.io/) can automatically refresh the app when +changes to the `./src/` directory are made. + +### Running Unit and E2E Tests +[Karma](https://karma-runner.github.io/1.0/index.html), [Jasmine](https://jasmine.github.io/), and [Protrator (e2e test framework for AngularJS)](http://www.protractortest.org/#/) +are our test frameworks of choice, everything you need to run unit or E2E tests should already be installed via npm. + +| Task | File Extension | Description | +| --- | --- | --- | +| `gulp test:unit` | `*.spec.js` | Runs only the unit tests | +| `gulp test:e2e` | `*.test.js` | Runs only the E2E tests | +| `gulp test` | `*.spec.js` or `*.test.js` | Runs both the unit and E2E tests | + +### Compiling for Production +You can run the following command to compile your code to a production-ready +state: ```sh -$ bower install packagename --save +$ gulp compile ``` +This will concat all similar file types into a single file, minify the code, and drop the result into a new `./compile/` folder. +Images in the `./src/assets/` directory are compressed for web optimization and template file contents are stringified +and added to the angular `$templateCache` for faster load times. -The `--save` flag tells Bower to add the package at its current version to -our project's `bower.js` file so should another developer download our -application (or we download it from a different computer), we can simply run the -`bower install` command as above and all our dependencies will be installed for -us. Neat! +>While we've worked hard to ensure that your app will behave the same on both build and compile, it is always recommended that +the compiled code be thoroughly tested before moving to production. -Technically, `OrderCloud` is now ready to go. - -To ensure your setup works, build your application and then run it with the following -commands: +When the compile is complete, the express server will fire up again and open the app @ `http://localhost:3000/`. For performance reasons +the watch is not fired on compile like it is on build. +### Deploying to [GitHub Pages](https://pages.github.com/) +Having worked in the B2B world for over 15 years we know that showing development progress is extremely important, especially +during large projects. That is why we've provided an easy way for you to deploy your compiled code directly to a gh-pages branch +for fast and easy demos! ```sh -$ gulp build +$ gulp deploy ``` +This will push a compiled version of your working copy directly to your default git remote and can be viewed at `username.github.io/repository-name`. +> **Important Note!** Your angular app _must **not**_ be in HTML5 mode for the routing on gh-pages to work properly. This +can be changed in `./src/app/app.constants.json` prior to running the task. -The built files are placed in the `build/` directory by default. And you application -should automatically open in the browser window on a localhost! +> Github pages can take a few minutes (about 10) to propagate before your app will become available. -`watch` actually starts a few other processes in the background to help you develop your -application. Using `browser-sync` and some built in gulp functions the app is now watching -for changes in your source directory. Should you make any changes to your html or js files -the app should automatically reload your application with the appropriate changes. Also -if you make any changes to your style sheets (less or css) the app will rebuild those changes -and inject them directly into the application, without reloading the entire page! +Of course, this is not the only deployment option available. Angular-based OrderCloud applications are [preconfigured](https://devcenter.heroku.com/categories/nodejs) +to be deployed on [Heroku](https://www.heroku.com/) using their [GitHub integration](https://devcenter.heroku.com/articles/github-integration) and the +`./compile` directory is made up of entirely static files that can be easily deployed to any hosting provider. -When you're ready to push your app into production, just run the `compile` -command: +## Contributors +The OrderCloud team welcomes any and all open-source contributors to create a pull request for bug fixes, enhancements, or new features (pending review). -```sh -$ gulp compile -``` +Prior to writing any code, be sure to [open an issue](https://github.com/ordercloud-api/angular-buyer/issues) with a detailed description of +your problem or proposed enhancement. We may already be on our way to delivering what you want! -This will concatenate and minify your sources and place them by default into the -`compile/` directory. There will only be three files (excluding assets): `index.html`, -`OrderCloud.js`, and `OrderCloud.css`. All of the vendor dependencies like -AngularJS styles and the OrderCloud-SDK itself have been added to them for super-easy -deploying. If you use any assets (`src/assets/`) then they will be copied to -`compile/` as is. +The OrderCloud team uses GitHub's standard [fork, branch, pull request workflow](https://gist.github.com/Chaser324/ce0505fbed06b947d962) and +we expect any contributors to follow a similar workflow. Always provide a passing unit test for any fix or enhancement. -Lastly, a complete build is always available by simply running the default -task, which runs `build` and then `compile`: +Thank you for being a part of the [OrderCloud Community](http://community.ordercloud.io) and helping make our resources the best they can be! -```sh -$ gulp -``` +## Further Reading +- [Source Code Overview](src/README.md) +- [Connecting to Your Buyer Organization](src/app/README.md#appconstantsjson) - _coming soon_ +- [Application Files](src/app/README.md) - _coming soon_ +- [Authentication Management](src/app/login/README.md) - _coming soon_ +- [Themes and Styles](src/app/styles/README.md) - _coming soon_ +- [Common Resources](src/app/common/README.md) - _coming soon_ diff --git a/src/README.md b/src/README.md index b5379c90..209e5b5f 100644 --- a/src/README.md +++ b/src/README.md @@ -1,45 +1,51 @@ -# The `src` Directory - -## Overview - -The `src/` directory contains all code used in the application along with all -tests of such code. +# `./src/` Directory +This is where the majority of development work will occur. It contains all +of the application code, tests, and assets. ``` src/ |- app/ - | |- common/ - | |- styles/ - | |- app.config.js - | |- app.constants.json - | |- app.controller.js - | |- app.module.js - | |- app.run.js - | |- app.spec.js |- assets/ - | |- images/ |- index.html ``` -- `src/app/` - application-specific code, i.e. code not likely to be reused in - another application. [Read more »](app/README.md) -- `src/assets/` - static files like fonts and images. - [Read more »](assets/README.md) -- `src/index.html` - this is the HTML document of the single-page application. - See below. - -See each directory for a detailed explanation. +- [`src/app/`](app/README.md) - contains all of the application code and corresponding tests +- [`src/assets/`](assets/README.md) - static files like fonts and images +- [`src/index.html`](#indexhtml) - this is the HTML document of the single-page application ## `index.html` +The index file is the HTML document of the single-page application (SPA). +This is the highest level container for everything in your angular application. + +### `` +The [application module (orderCloud)](app/README.md) and [application controller (AppCtrl)](app/README.md) +are both loaded on the `` element. We use the +[controllerAs syntax](https://toddmotto.com/digging-into-angulars-controller-as-syntax/), so keep +in mind that anything attached to the `AppCtrl` view model is accessible under the name +`application` in all of your template files. + +### `` +Within the `` element there are some basic `` tags and a dynamic +`` tag which takes advantage of `ui-router`'s `$state` service and the `appname` +constant. You can see how we are referencing the `AppCtrl` via the controllerAs syntax below: + +```html +//dynamic application title + +<title ng-bind="application.$state.current.data.pageTitle + (application.$state.current.data.pageTitle ? ' | ' : '') + application.name"> + OrderCloud + +``` +After the ``, there are some very important comments that are +used to dynamically set the `base[href]` attribute and inject reference bower and application +CSS styles during the gulp `build` and `compile`. + +At the end of the `<head>` you will find the link for the OrderCloud favicon. + +### `<body>` +The body element contains the `ui-view` in which all other application templates will be loaded. +Within the `<ui-view>` element we've placed the HTML used by [cg-busy]() to display a +loading indicator while angular bootstraps itself. -The `index.html` file is the HTML document of the single-page application (SPA) -that should contain all markup that applies to everything in the app, such as -the header and footer. It declares with `ngApp` that this is `orderCloud`, -specifies the main `AppCtrl` controller, and contains the `uiView` directive -into which route templates are placed. - -Unlike any other HTML document (e.g. the templates), `index.html` is compiled as -a Grunt template, so variables from `Gruntfile.js` and `package.json` can be -referenced from within it. Changing `name` in `package.json` from -"orderCloud" will rename the resultant CSS and JavaScript placed in `build/`, -so this HTML references them by variable for convenience. +At the end of the body we again have some important comment markup that is used to +dynamically inject all of the bower and application javascript files. \ No newline at end of file diff --git a/src/app/login/README.md b/src/app/login/README.md new file mode 100644 index 00000000..e69de29b From 23eee7b6801997034f2895fef568fbd6b6600372 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 10 Mar 2017 17:06:43 -0600 Subject: [PATCH 030/158] Fixing some ocConfirm unit tests --- src/app/myAddresses/tests/myAddresses.spec.js | 2 +- src/app/myOrders/tests/myOrders.spec.js | 2 +- src/app/myPayments/tests/myPayments.spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/myAddresses/tests/myAddresses.spec.js b/src/app/myAddresses/tests/myAddresses.spec.js index 172a5449..05b10971 100644 --- a/src/app/myAddresses/tests/myAddresses.spec.js +++ b/src/app/myAddresses/tests/myAddresses.spec.js @@ -90,7 +90,7 @@ describe('Component: myAddresses', function(){ 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?'); + expect(confirm.Confirm).toHaveBeenCalled(); scope.$digest(); expect(oc.Me.DeleteAddress).toHaveBeenCalledWith('MOCK_ADDRESS_ID'); expect(toaster.success).toHaveBeenCalledWith('Address Deleted', 'Success'); diff --git a/src/app/myOrders/tests/myOrders.spec.js b/src/app/myOrders/tests/myOrders.spec.js index bb4ac9c0..66fb9d54 100644 --- a/src/app/myOrders/tests/myOrders.spec.js +++ b/src/app/myOrders/tests/myOrders.spec.js @@ -219,7 +219,7 @@ describe('Component: MyOrders', function() { orderDetailCtrl.cancelOrder(mockOrderID); }); it('should call OrderCloud Confirm', function() { - expect(confirm.Confirm).toHaveBeenCalledWith('Are you sure you want to cancel this order?'); + expect(confirm.Confirm).toHaveBeenCalled(); }); it('should call Orders.Cancel', function(){ scope.$digest(); diff --git a/src/app/myPayments/tests/myPayments.spec.js b/src/app/myPayments/tests/myPayments.spec.js index 7382abac..37ea624f 100644 --- a/src/app/myPayments/tests/myPayments.spec.js +++ b/src/app/myPayments/tests/myPayments.spec.js @@ -146,7 +146,7 @@ describe('Component: myPayments', function() { myPaymentCtrl.delete({$index:0, creditCard:mockCreditCard}); }); it('should call the delete credit card function, then call Authorize.Net service , then reload the state and display success toaster', function(){ - expect(confirm.Confirm).toHaveBeenCalledWith("Are you sure you want to delete this Credit Card?"); + expect(confirm.Confirm).toHaveBeenCalled(); scope.$digest(); expect(authNet.DeleteCreditCard).toHaveBeenCalled(); From a72dc55729d2c1b5be0ff3f0c95079e073d194da Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood <zdawood@four51.com> Date: Wed, 15 Mar 2017 12:18:26 -0500 Subject: [PATCH 031/158] [OC-2058] Fixed favorite products --- src/app/favoriteProducts/favoriteProducts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/favoriteProducts/favoriteProducts.js b/src/app/favoriteProducts/favoriteProducts.js index 69cb7225..75715884 100644 --- a/src/app/favoriteProducts/favoriteProducts.js +++ b/src/app/favoriteProducts/favoriteProducts.js @@ -126,7 +126,8 @@ function FavoriteProductController($scope, OrderCloud, toastr){ function addProduct(existingList){ existingList.push($scope.product.ID); OrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) - .then(function(){ + .then(function(data){ + vm.hasFavorites = data.xp && data.xp.FavoriteProducts; vm.isFavorited = true; toastr.success($scope.product.Name + ' was added to your favorites'); }); From 52bc133bf853feea6f7dc0b9f444df46e0eec8c1 Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood <zdawood@four51.com> Date: Fri, 17 Mar 2017 11:04:34 -0500 Subject: [PATCH 032/158] [OC-2058] update so if user doesn't have xp.Favorite products --- src/app/favoriteProducts/favoriteProducts.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/app/favoriteProducts/favoriteProducts.js b/src/app/favoriteProducts/favoriteProducts.js index 75715884..6306f3f8 100644 --- a/src/app/favoriteProducts/favoriteProducts.js +++ b/src/app/favoriteProducts/favoriteProducts.js @@ -109,7 +109,24 @@ function FavoriteProductDirective(){ function FavoriteProductController($scope, OrderCloud, toastr){ var vm = this; - vm.hasFavorites = $scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts; + if($scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts){ + vm.hasFavorites = true; + } + else{ + if($scope.currentUser && $scope.currentUser.xp){ + $scope.currentUser.xp.FavoriteProducts = []; + }else{ + $scope.currentUser.xp ={}; + $scope.currentUser.xp.FavoriteProducts = []; + } + OrderCloud.Me.Patch( {xp:$scope.currentUser.xp}) + .then(function(){ + vm.hasFavorites = true; + }) + .catch(function(ex){ + console.log(ex); + }); + } vm.isFavorited = vm.hasFavorites && $scope.currentUser.xp.FavoriteProducts.indexOf($scope.product.ID) > -1; vm.toggleFavoriteProduct = function(){ From 5239b264431135dbb87b0a33ac2e08d30ab1496b Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 17 Mar 2017 15:12:48 -0500 Subject: [PATCH 033/158] OC-2048 and OC-2049 build out approvals component. A lot of similarities to the one in admin --- src/app/account/templates/account.tpl.html | 4 +- src/app/base/templates/navigation.tpl.html | 4 +- src/app/myOrders/myOrders.js | 207 ------------------ .../templates/myOrders.detail.tpl.html | 136 ------------ src/app/myOrders/templates/myOrders.tpl.html | 146 ------------ src/app/{myOrders => orders}/myOrders.md | 0 .../orderApprovals/js/oc-approvals.service.js | 85 +++++++ .../js/orderApprovals.config.js | 21 ++ .../js/orderApprovals.controller.js | 55 +++++ .../templates/approve.modal.html | 17 ++ .../templates/orderApprovals.html | 112 ++++++++++ .../js/oc-orderDetails.service.js | 30 +++ .../orderDetails/js/orderDetails.config.js | 25 +++ .../js/orderDetails.controller.js | 25 +++ .../orderDetails/templates/orderDetails.html | 137 ++++++++++++ .../orders/orderList/js/oc-orders.service.js | 60 +++++ src/app/orders/orderList/js/orders.config.js | 25 +++ .../orders/orderList/js/orders.controller.js | 106 +++++++++ .../orders/orderList/templates/orders.html | 117 ++++++++++ .../tests/myOrders.spec.js | 0 .../tests/myOrders.test.js | 0 21 files changed, 819 insertions(+), 493 deletions(-) delete mode 100644 src/app/myOrders/myOrders.js delete mode 100644 src/app/myOrders/templates/myOrders.detail.tpl.html delete mode 100644 src/app/myOrders/templates/myOrders.tpl.html rename src/app/{myOrders => orders}/myOrders.md (100%) create mode 100644 src/app/orders/orderApprovals/js/oc-approvals.service.js create mode 100644 src/app/orders/orderApprovals/js/orderApprovals.config.js create mode 100644 src/app/orders/orderApprovals/js/orderApprovals.controller.js create mode 100644 src/app/orders/orderApprovals/templates/approve.modal.html create mode 100644 src/app/orders/orderApprovals/templates/orderApprovals.html create mode 100644 src/app/orders/orderDetails/js/oc-orderDetails.service.js create mode 100644 src/app/orders/orderDetails/js/orderDetails.config.js create mode 100644 src/app/orders/orderDetails/js/orderDetails.controller.js create mode 100644 src/app/orders/orderDetails/templates/orderDetails.html create mode 100644 src/app/orders/orderList/js/oc-orders.service.js create mode 100644 src/app/orders/orderList/js/orders.config.js create mode 100644 src/app/orders/orderList/js/orders.controller.js create mode 100644 src/app/orders/orderList/templates/orders.html rename src/app/{myOrders => orders}/tests/myOrders.spec.js (100%) rename src/app/{myOrders => orders}/tests/myOrders.test.js (100%) diff --git a/src/app/account/templates/account.tpl.html b/src/app/account/templates/account.tpl.html index fc173f6d..16a37c58 100644 --- a/src/app/account/templates/account.tpl.html +++ b/src/app/account/templates/account.tpl.html @@ -13,8 +13,8 @@ <li ui-sref-active="active"> <a href="" ui-sref="favoriteProducts">Favorite Products</a> </li> - <li ui-sref-active="active"> - <a href="" ui-sref="myOrders">Order History</a> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a href="" ui-sref="orders">Orders</a> </li> </ul> </aside> diff --git a/src/app/base/templates/navigation.tpl.html b/src/app/base/templates/navigation.tpl.html index 76898948..35a0689b 100644 --- a/src/app/base/templates/navigation.tpl.html +++ b/src/app/base/templates/navigation.tpl.html @@ -30,12 +30,12 @@ <div class="c-topnav__item c-topnav__account" uib-dropdown ng-if="!base.currentUser.Anonymous"> <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span class="hidden-xs hidden-sm">Account</span> <span class="caret hidden-xs"></span></a> <ul class="dropdown-menu-right" uib-dropdown-menu> - <li ui-sref-active="active"><a ui-sref="account">My Account</a></li> + <li><a ui-sref="account">My Account</a></li> <li class="divider"></li> <li ui-sref-active="active"><a ui-sref="myAddresses">Personal Addresses</a></li> <li ui-sref-active="active"><a ui-sref="myPayments">Payment Methods</a></li> <li ui-sref-active="active"><a ui-sref="favoriteProducts">Favorite Products</a></li> - <li ui-sref-active="active"><a ui-sref="myOrders">Order History</a></li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"><a ui-sref="orders">Orders</a></li> <li class="divider"></li> <li><a ng-click="application.logout()">Log out</a></li> </ul> diff --git a/src/app/myOrders/myOrders.js b/src/app/myOrders/myOrders.js deleted file mode 100644 index d5ce5008..00000000 --- a/src/app/myOrders/myOrders.js +++ /dev/null @@ -1,207 +0,0 @@ -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({ - message:'Are you sure you want to cancel this order?', - confirmText: 'Yes, cancel order', - type: 'delete'}) - .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/templates/myOrders.detail.tpl.html b/src/app/myOrders/templates/myOrders.detail.tpl.html deleted file mode 100644 index e402d203..00000000 --- a/src/app/myOrders/templates/myOrders.detail.tpl.html +++ /dev/null @@ -1,136 +0,0 @@ -<article> - <h3> - <div class="pull-right"> - <ordercloud-favorite-order current-user="base.currentUser" order="myOrderDetail.order"></ordercloud-favorite-order> - <button ng-if="myOrderDetail.canCancel" ng-click="myOrderDetail.cancelOrder(myOrderDetail.order.ID)" class="btn btn-default"><span class="text-danger">Cancel Order</span></button> - <ordercloud-repeat-order original-order-id="myOrderDetail.order.ID" current-order-id="base.currentOrder.ID"></ordercloud-repeat-order> - </div> - <button ui-sref="^" class="btn btn-default"><i class="fa fa-arrow-left"></i></button> - <b>Order ID:</b> {{myOrderDetail.order.ID}} - </h3> - <hr> - <div class="row"> - <div class="col-sm-7"> - <h5>Date Submitted: <span class="pull-right">{{myOrderDetail.order.DateSubmitted | date:'short'}}</span></h5> - <h5>Subtotal: <span class="pull-right">{{myOrderDetail.order.Subtotal | currency}}</span></h5> - <h5 ng-if="myOrderDetail.order.ShippingCost" class="text-muted">Shipping: <span class="pull-right"> + {{myOrderDetail.order.ShippingCost | currency}}</span></h5> - <h5 ng-if="myOrderDetail.order.TaxCost" class="text-muted">Tax: <span class="pull-right"> + {{myOrderDetail.order.TaxCost | currency}}</span></h5> - <h5 ng-repeat="promotion in myOrderDetail.promotions" class="text-danger"> - {{promotion.Code}} - <span class="pull-right">- {{promotion.Amount | currency}}</span></h5> - <hr> - <h4>Total: <b class="pull-right text-primary">{{myOrderDetail.order.Total | currency}}</b></h4> - <hr> - <h4> - <ng-pluralize count="myOrderDetail.paymentList.length" - when="{ - '1': 'Payment', - 'other': '{} Payments' - }"></ng-pluralize> - </h4> - <hr> - <div ng-repeat="payment in myOrderDetail.paymentList"> - <p>{{payment.Type | humanize}} <b class="pull-right text-primary">{{payment.Amount | currency}}</b></p> - - <p ng-if="payment.xp.PONumber"><b>PO#:</b> {{payment.xp.PONumber}}</p> - - <p ng-if="payment.Type == 'CreditCard'"> - <i style="font-size:1.3em;" class="fa {{payment.Details.CardType | faCreditCard}} pull-left"></i> - <span class="text-muted">XXXX-XXXX-XXXX-</span>{{payment.Details.PartialAccountNumber}} - </p> - - <p ng-if="payment.Type == 'SpendingAccount'"> - {{payment.Details.Name}} <br> - <small><span class="text-muted">Remaining Balance:</span> {{payment.Details.Balance | currency}}</small> - </p> - <hr ng-if="!$last"> - </div> - </div> - <div class="col-sm-5"> - <h5>Delivery Address</h5> - <div class="panel panel-default"> - <div class="panel-body"> - <p ng-bind-html="myOrderDetail.list.Items[0].ShippingAddress | address:'full'"></p> - </div> - </div> - <h5>Billing Address</h5> - <div class="panel panel-default"> - <div class="panel-body"> - <p ng-bind-html="myOrderDetail.order.BillingAddress | address:'full'"></p> - </div> - </div> - </div> - </div> - <hr> - <h4> - <ng-pluralize count="myOrderDetail.order.LineItemCount" - when="{ - '1': '1 Line Item', - 'other': '{} Line Items' - }"></ng-pluralize> - </h4> - <hr> - <div class="row hidden-xs c-line-item__header"> - <div class="col-xs-3 col-sm-2"></div> - <div class="col-xs-9 col-sm-10"> - <div class="row"> - <div class="col-sm-5 col-lg-6"><h6>Description</h6></div> - <div class="col-sm-7 col-lg-6"> - <div class="row"> - <div class="col-xs-4"><h6 class="text-right">Price</h6></div> - <div class="col-xs-4"><h6 class="text-center">Qty</h6></div> - <div class="col-xs-4"><h6 class="text-right">Total</h6></div> - </div> - </div> - </div> - </div> - <div class="col-xs-12"> - <hr> - </div> - </div> - <div class="row c-line-item" ng-repeat="lineItem in myOrderDetail.list.Items track by $index"> - <div class="col-xs-3 col-sm-2"> - <div class="thumbnail c-line-item__img"> - <img class="img-responsive" ng-src="{{lineItem.xp.image.URL || 'http://placehold.it/100x100?text=' + lineItem.Product.Name}}" - alt="{{lineItem.Product.xp.image.Name || 'Product Image'}}"> - </div> - </div> - <div class="col-xs-9 col-sm-10"> - <div class="row c-line-item__info c-line-item--centered"> - <div class="col-sm-5 col-lg-6 c-line-item__info--top"> - <h3 class="c-line-item__name"> - <a href="#">{{lineItem.Product.Name}}</a> - </h3> - <small class="text-muted c-line-item__id">{{lineItem.ProductID}}</small> - <ul class="c-line-item__spec-list" ng-if="lineItem.Specs.length > 0"> - <li class="c-line-item__spec" ng-repeat="spec in lineItem.Specs"> - <small>{{spec.Name}}:</small> - <small>{{spec.Value}}</small> - </li> - </ul> - </div> - <div class="col-sm-7 col-lg-6 c-line-item__info--bottom"> - <div class="row c-line-item--centered"> - <div class="col-xs-4"> - <h4 class="c-line-item__price text-right">{{lineItem.UnitPrice | currency}}</h4> - </div> - <div class="col-xs-4 text-center"> - <h4 class="c-line-item__qty-display "> - {{lineItem.Quantity}} - </h4> - <small class="help-block" ng-if="lineItem.Product.QuantityMultiplier > 1"> - {{'x ' + lineItem.Product.QuantityMultiplier + (lineItem.Quantity ? (' (' + (lineItem.Quantity * lineItem.Product.QuantityMultiplier) + ')') : '')}} - </small> - </div> - <div class="col-xs-4"> - <h4 class="c-line-item__total text-right">{{lineItem.LineTotal | currency}}</h4> - </div> - </div> - </div> - </div> - </div> - <div class="col-xs-12"> - <hr> - </div> - </div> -</article> \ No newline at end of file diff --git a/src/app/myOrders/templates/myOrders.tpl.html b/src/app/myOrders/templates/myOrders.tpl.html deleted file mode 100644 index 0b99914f..00000000 --- a/src/app/myOrders/templates/myOrders.tpl.html +++ /dev/null @@ -1,146 +0,0 @@ -<article ui-view> - <h3><i class="fa fa-clock-o"></i> Order History</h3> - <hr> - <!--====== SEARCH/FILTERS ======--> - <form name="OrdersSearchForm" class="form-inline" ng-submit="myOrders.search()"> - <fieldset class="form-group"> - <input type="search" placeholder="Search order history..." ng-model="myOrders.parameters.search" class="form-control"> - </fieldset> - <fieldset class="form-group" ng-class="{'text-center':application.$ocMedia('max-width:767px')}"> - <span ng-class="{'btn-group':myOrders.searchResults}"> - <button type="submit" class="btn btn-primary">Search</button> - <button ng-if="myOrders.searchResults" ng-click="myOrders.clearSearch()" type="button" class="btn btn-default"><i class="fa fa-times"></i></button> - </span> - <span ng-class="{'btn-group':myOrders.filtersApplied}"> - <button type="button" class="btn btn-default" ng-click="myOrders.showFilters = !myOrders.showFilters"><i class="fa fa-filter"></i> Filters</button> - <button ng-if="myOrders.filtersApplied" ng-click="myOrders.clearFilters()" type="button" class="btn btn-default"><i class="fa fa-times"></i></button> - </span> - </fieldset> - </form> - <div class="row" style="margin-top:15px;" uib-collapse="!myOrders.showFilters"> - <div class="col-md-6"> - <div class="form-group" ng-if="application.$ocMedia('max-width:767px')"> - <label>Sort By:</label> - <div ng-class="{'input-group':myOrders.sortSelection}"> - <select placeholder="Sort" class="form-control" ng-model="myOrders.sortSelection" ng-change="myOrders.updateSort()"> - <option value="">None</option> - <option value="ID">ID</option> - <option value="Status">Status</option> - <option value="DateCreated">Date Created/Submitted</option> - </select> - <div ng-if="myOrders.sortSelection" class="input-group-btn"> - <button class="btn btn-default" ng-click="myOrders.reverseSort()"> - <i class="fa fa-sort"></i> - </button> - </div> - </div> - </div> - <div class="row"> - <div class="col-sm-6"> - <div class="form-group"> - <label>Order Status</label> - <select ng-model="myOrders.parameters.filters.Status" ng-change="myOrders.filter(true)" class="form-control"> - <option value="">All</option> - <option value="Open">Open</option> - <option value="AwaitingApproval">Awaiting Approval</option> - <option value="Completed">Completed</option> - <option value="Declined">Declined</option> - <option value="Cancelled">Cancelled</option> - </select> - </div> - </div> - <div class="col-sm-6"> - <label></label> - <div class="form-group"> - <span ng-click="myOrders.toggleFavorites()"> - <button class="btn btn-default form-control"> - <i class="fa" ng-class="{'fa-heart-o text-muted': !myOrders.parameters.favorites, 'fa-heart text-danger': myOrders.parameters.favorites}"></i><b> My Favorites</b> - </button> - </span> - </div> - </div> - </div> - </div> - <div class="col-md-6"> - <div class="row"> - <div class="col-sm-6"> - <div class="form-group"> - <label>From Date</label> - <input ng-if="!application.isTouchDevice" type="date" class="form-control" ng-blur="myOrders.filter(true)" ng-model="myOrders.parameters.from"> - <input ng-if="application.isTouchDevice" uib-datepicker-popup datepicker-options="{maxDate:myOrders.parameters.to}" is-open="fromDate.open" ng-change="myOrders.filter(true)" ng-click="fromDate.open = !fromDate.open" type="date" class="form-control" ng-model="myOrders.parameters.from"> - </div> - </div> - <div class="col-sm-6"> - <div class="form-group"> - <label>To Date</label> - <input ng-if="!application.isTouchDevice" type="date" class="form-control" ng-blur="myOrders.filter(true)" ng-model="myOrders.parameters.to"> - <input ng-if="application.isTouchDevice" uib-datepicker-popup datepicker-options="{minDate:myOrders.parameters.from}" is-open="toDate.open" ng-change="myOrders.filter(true)" ng-click="toDate.open = !toDate.open" type="date" class="form-control" ng-model="myOrders.parameters.to"> - </div> - </div> - </div> - </div> - </div> - <!--====== LIST ======--> - <div class="no-matches" ng-if="!myOrders.list.Items.length"> - <b>No matches found.</b> - </div> - <div ng-if="myOrders.list.Items.length"> - <b class="pull-right">{{(application.$ocMedia('min-width:768px') ? myOrders.list.Meta.ItemRange[0] : '1') + ' - ' + myOrders.list.Meta.ItemRange[1] + ' of ' + myOrders.list.Meta.TotalCount + ' results'}}</b> - <table class="table table-hover oc-table-responsive"> - <thead> - <tr> - <th></th> - <th scope="col"> - <a href="#" role="button" ng-click="myOrders.updateSort('ID')"> - ID - <i class="fa fa-caret-down" ng-show="myOrders.parameters.sortBy == 'ID'"></i> - <i class="fa fa-caret-up" ng-show="myOrders.parameters.sortBy == '!ID'"></i> - </a> - </th> - <th scope="col"> - <a href="#" role="button" ng-click="myOrders.updateSort('Status')"> - Status - <i class="fa fa-caret-down" ng-show="myOrders.parameters.sortBy == 'Status'"></i> - <i class="fa fa-caret-up" ng-show="myOrders.parameters.sortBy == '!Status'"></i> - </a> - </th> - <th scope="col"> - <a href="#" role="button" ng-click="myOrders.updateSort('DateCreated')"> - Date Submitted - <i class="fa fa-caret-down" ng-show="myOrders.parameters.sortBy == 'DateCreated'"></i> - <i class="fa fa-caret-up" ng-show="myOrders.parameters.sortBy == '!DateCreated'"></i> - </a> - </th> - <th scope="col">Total</th> - <th></th> - </tr> - </thead> - <tbody> - <tr ng-repeat="order in myOrders.list.Items"> - <td class="actions-cell"> - <ordercloud-favorite-order current-user="base.currentUser" order="order"></ordercloud-favorite-order> - </td> - <th scope="row">{{order.ID}}</th> - <td data-title="Status">{{order.Status}}</td> - <td data-title="Date Created/Submitted">{{(order.DateSubmitted || order.DateCreated) | date}}</td> - <td data-title="Total">{{order.Total | currency}}</td> - <td class="actions-cell"> - <button class="btn btn-default btn-sm" ui-sref="myOrders.detail({orderid: order.ID})">View Order</button> - </td> - </tr> - </tbody> - </table> - <div class="text-center" ng-if="application.$ocMedia('min-width:768px') && myOrders.list.Meta.TotalPages > 1"> - <uib-pagination boundary-links="myOrders.list.Meta.TotalPages > 5" - max-size="5" total-items="myOrders.list.Meta.TotalCount" - items-per-page="myOrders.list.Meta.PageSize" - ng-model="myOrders.list.Meta.Page" - ng-change="myOrders.pageChanged(myOrders.list.Meta.Page)"></uib-pagination> - </div> - <button type="button" - ng-if="application.$ocMedia('max-width:767px')" - class="btn btn-default btn-block btn-lg" - ng-show="myOrders.list.Meta.Page < myOrders.list.Meta.TotalPages" - ng-click="myOrders.loadMore()">Load More</button> - </div> -</article> \ No newline at end of file diff --git a/src/app/myOrders/myOrders.md b/src/app/orders/myOrders.md similarity index 100% rename from src/app/myOrders/myOrders.md rename to src/app/orders/myOrders.md diff --git a/src/app/orders/orderApprovals/js/oc-approvals.service.js b/src/app/orders/orderApprovals/js/oc-approvals.service.js new file mode 100644 index 00000000..905fe660 --- /dev/null +++ b/src/app/orders/orderApprovals/js/oc-approvals.service.js @@ -0,0 +1,85 @@ +angular.module('orderCloud') + .factory('ocApprovals', ocApprovals) +; + +function ocApprovals(OrderCloud, $q, $uibModal, $state){ + var service = { + List: _list, + UpdateApprovalStatus: _updateApprovalStatus + }; + + function _list(orderID, buyerID, page, pageSize) { + var deferred = $q.defer(); + + OrderCloud.Orders.ListApprovals(orderID, null, page, pageSize, null, 'Status', null, buyerID) + .then(function(data) { + getApprovingUserGroups(data) + }); + + function getApprovingUserGroups(data) { + var userGroupIDs = _.uniq(_.pluck(data.Items, 'ApprovingGroupID')); + OrderCloud.UserGroups.List(null, 1, 100, null, null, {ID: userGroupIDs.join('|')}, buyerID) + .then(function(userGroupList) { + _.each(data.Items, function(approval) { + approval.ApprovingUserGroup = _.findWhere(userGroupList.Items, {ID: approval.ApprovingGroupID}); + }); + getApprovingUsers(data); + }) + .catch(function() { + getApprovingUsers(data); + }); + } + + function getApprovingUsers(data){ + var userIDs = _.compact(_.uniq(_.pluck(data.Items, 'ApproverID'))); + OrderCloud.Users.List(null, null, 1, 100, null, null, {ID: userIDs.join('|')}, buyerID) + .then(function(userList){ + _.each(data.Items, function(approval){ + if(approval.Status !== 'Pending') approval.ApprovingUser = _.findWhere(userList.Items, {ID: approval.ApproverID}); + }); + getApprovalRules(data); + }) + .catch(function(){ + getApprovalRules(data); + }); + } + + function getApprovalRules(data) { + var approvalRuleIDs = _.pluck(data.Items, 'ApprovalRuleID'); + OrderCloud.ApprovalRules.List(null, 1, 100, null, null, {ID: approvalRuleIDs.join('|')}, buyerID) + .then(function(approvalRuleData) { + angular.forEach(data.Items, function(approval) { + approval.ApprovalRule = _.findWhere(approvalRuleData.Items, {ID: approval.ApprovalRuleID}); + }); + deferred.resolve(data); + }) + .catch(function() { + deferred.resolve(data); + }); + } + + return deferred.promise; + } + + function _updateApprovalStatus(orderID, intent){ + return $uibModal.open({ + templateUrl: 'orders/orderApprovals/templates/approve.modal.html', + controller: 'ApprovalModalCtrl', + controllerAs: 'approvalModal', + size: 'md', + resolve: { + OrderID: function() { + return orderID; + }, + Intent: function(){ + return intent; + } + } + }).result + .then(function(){ + $state.reload(); + }); + } + + return service; +} \ No newline at end of file diff --git a/src/app/orders/orderApprovals/js/orderApprovals.config.js b/src/app/orders/orderApprovals/js/orderApprovals.config.js new file mode 100644 index 00000000..5bbbbcad --- /dev/null +++ b/src/app/orders/orderApprovals/js/orderApprovals.config.js @@ -0,0 +1,21 @@ +angular.module('orderCloud') + .config(ApprovalsConfig) +; + +function ApprovalsConfig($stateProvider){ + $stateProvider + .state('orderDetail.approvals', { + url: '/approvals', + templateUrl: 'orders/orderApprovals/templates/orderApprovals.html', + controller: 'OrderApprovalsCtrl', + controllerAs: 'orderApprovals', + data: { + pageTitle: 'Order Approvals' + }, + resolve: { + OrderApprovals: function($stateParams, ocApprovals) { + return ocApprovals.List($stateParams.orderid, $stateParams.buyerid, 1, 100); + } + } + }); +} \ No newline at end of file diff --git a/src/app/orders/orderApprovals/js/orderApprovals.controller.js b/src/app/orders/orderApprovals/js/orderApprovals.controller.js new file mode 100644 index 00000000..a3c94086 --- /dev/null +++ b/src/app/orders/orderApprovals/js/orderApprovals.controller.js @@ -0,0 +1,55 @@ +angular.module('orderCloud') + .controller('OrderApprovalsCtrl', OrderApprovalsController) + .controller('ApprovalModalCtrl', ApprovalModalController) +; + +function OrderApprovalsController(OrderApprovals, OrderCloud, ocApprovals, $stateParams) { + var vm = this; + vm.list = OrderApprovals; + + vm.pageChanged = function() { + ocApprovals.List($stateParams.orderid, $stateParams.buyerid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list = data; + }); + }; + + vm.loadMore = function() { + vm.list.Meta.Page++; + ocApprovals.List($stateParams.orderid, $stateParams.buyerid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + }; + + vm.updateApprovalStatus = function(intent){ + //intent is a string either 'Approve' or 'Decline' + return ocApprovals.UpdateApprovalStatus($stateParams.orderid, intent); + }; +} + +function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalInstance, OrderCloud, toastr){ + var vm = this; + vm.intent = Intent; // 'Approve' or 'Decline' + vm.orderid = OrderID; + vm.comments = ''; + + vm.cancel = cancel; + vm.submit = submit; + + function cancel(){ + return $uibModalInstance.dismiss(); + } + + function submit(){ + return OrderCloud.Orders[vm.intent](vm.orderid, vm.comments) + .then(function(){ + toastr.success('Order ' + vm.intent + 'd'); + $uibModalInstance.close(); + }) + .catch(function(ex){ + $exceptionHandler(ex); + }); + } +} \ No newline at end of file diff --git a/src/app/orders/orderApprovals/templates/approve.modal.html b/src/app/orders/orderApprovals/templates/approve.modal.html new file mode 100644 index 00000000..7e7b86ee --- /dev/null +++ b/src/app/orders/orderApprovals/templates/approve.modal.html @@ -0,0 +1,17 @@ +<form name="updateApprovalStatusForm" ng-submit="approvalModal.submit()" cg-busy="approvalModal.loading"> + <div class="modal-header"> + <button type="button" class="close" aria-label="Close" ng-click="approvalModal.cancel()"><span aria-hidden="true">×</span></button> + <h3 class="modal-title">{{approvalModal.intent}} Order</h3> + </div> + <div class="modal-body"> + <fieldset class="form-group"> + <label for="ApprovalComments" class="col-sm-3 control-label">Comment</label> + <div class="col-sm-9"> + <textarea rows="4" id="ProductDescription" placeholder="(Optional)" class="form-control" ng-model="approvalModal.comments"></textarea> + </div> + </fieldset> + </div> + <div class="modal-footer"> + <button type="submit" class="btn btn-primary btn-block" ng-disabled="updateApprovalStatusForm.$invalid">Save</button> + </div> +</form> \ No newline at end of file diff --git a/src/app/orders/orderApprovals/templates/orderApprovals.html b/src/app/orders/orderApprovals/templates/orderApprovals.html new file mode 100644 index 00000000..e5365437 --- /dev/null +++ b/src/app/orders/orderApprovals/templates/orderApprovals.html @@ -0,0 +1,112 @@ +<div cg-busy="application.stateLoading('approvals')"> + <!--====== PAYMENT LIST ======--> + <div ng-if="orderApprovals.list.Items.length"> + <div class="panel panel-default table-responsive" ng-if="(orderApprovals.list.Items | filter:{Status:'Pending'}).length"> + <div class="panel-heading">Pending Approvals</div> + <table class="table table-bordered l-approval-pending-table"> + <colgroup> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th>Approving User Group</th> + <th>Approval Rule Name</th> + <th>Approval Rule Description</th> + <th></th> + </tr> + </thead> + <tbody> + <tr ng-repeat="approval in orderApprovals.list.Items| filter:{Status:'Pending'}"> + <td>{{approval.ApprovingUserGroup.Name}}</td> + <td>{{approval.ApprovalRule.Name}}</td> + <td ng-bind-html="approval.ApprovalRule.Description" style="white-space: pre-wrap"></td> + <th> + <button class="btn btn-sm btn-primary btn-block" ng-click="orderApprovals.updateApprovalStatus('Approve')">Approve</button> + <button class="btn btn-sm btn-danger btn-block" ng-click="orderApprovals.updateApprovalStatus('Decline')">Decline</button> + </th> + </tr> + </tbody> + </table> + </div> + <div class="panel panel-default table-responsive" ng-if="(orderApprovals.list.Items | filter:{Status:'Approved'}).length"> + <div class="panel-heading"><span class="text-success">Approved</span></div> + <table class="table table-bordered l-approval-approved-table"> + <colgroup> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th>Approving User</th> + <th>Date Approved</th> + <th>Comments</th> + <th>Approval Rule Name</th> + <th>Approval Rule Description</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="approval in orderApprovals.list.Items| filter:{Status:'Approved'}"> + <td>{{approval.ApprovingUser.FirstName + ' ' + approval.ApprovingUser.LastName}}</td> + <td>{{approval.DateCompleted | date:'short'}}</td> + <td>{{approval.Comments}}</td> + <td>{{approval.ApprovalRule.Name}}</td> + <td style="white-space: pre-wrap" ng-bind-html="approval.ApprovalRule.Description"></td> + </tr> + </tbody> + </table> + </div> + <div class="panel panel-default table-responsive" ng-if="(orderApprovals.list.Items | filter:{Status:'Declined'}).length"> + <div class="panel-heading text-danger"><span class="text-success">Declined</span></div> + <table class="table table-bordered l-approval-declined-table"> + <colgroup> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th>Declining User</th> + <th>Date Declined</th> + <th>Comments</th> + <th>Approval Rule Name</th> + <th>Approval Rule Description</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="approval in orderApprovals.list.Items| filter:{Status:'Declined'}"> + <td>{{approval.ApproverUserName}}</td> + <td>{{approval.DateCompleted | date:'short'}}</td> + <td>{{approval.Comments}}</td> + <td>{{approval.ApprovalRule.Name}}</td> + <td style="white-space: pre-wrap" ng-bind-html="approval.ApprovalRule.Description"></td> + </tr> + </tbody> + </table> + </div> + </div> + <div ng-if="!orderApprovals.list.Items.length" class="no-matches"> + This order does not have any approvals. <br> + </div> + + <!--====== Approvals PAGINATION ======--> + <ul uib-pagination + class="pagination-sm pull-right hidden-xs" + ng-if="orderApprovals.list.Meta.TotalPages > 1" + total-items="orderApprovals.list.Meta.TotalCount" + items-per-page="orderApprovals.list.Meta.PageSize" + max-size="5" + boundary-links="orderApprovals.list.Meta.TotalPages > 5" + ng-model="orderApprovals.list.Meta.Page" + ng-change="orderApprovals.pageChanged()"> + </ul> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="orderApprovals.list.Meta.Page < orderApprovals.list.Meta.TotalPages" + ng-click="orderApprovals.loadMore()">Load More</button> +</div> \ No newline at end of file diff --git a/src/app/orders/orderDetails/js/oc-orderDetails.service.js b/src/app/orders/orderDetails/js/oc-orderDetails.service.js new file mode 100644 index 00000000..c68a7354 --- /dev/null +++ b/src/app/orders/orderDetails/js/oc-orderDetails.service.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .factory('ocOrderDetail', ocOrderDetailService) +; + +function ocOrderDetailService($q, $exceptionHandler, OrderCloud, $uibModal){ + var service = { + GetOrderDetails: _getOrderDetails + }; + + function _getOrderDetails(orderID){ + return OrderCloud.Orders.Get(orderID) + .then(function(order){ + return getBuyerOrg(order); + }); + + function getBuyerOrg(order){ + return OrderCloud.Buyers.Get(order.FromCompanyID) + .then(function(buyer){ + order.FromCompany = buyer; + return order; + }) + .catch(function(ex){ + $exceptionHandler(ex); + return order; + }); + } + } + + return service; +} \ No newline at end of file diff --git a/src/app/orders/orderDetails/js/orderDetails.config.js b/src/app/orders/orderDetails/js/orderDetails.config.js new file mode 100644 index 00000000..6b5b5b27 --- /dev/null +++ b/src/app/orders/orderDetails/js/orderDetails.config.js @@ -0,0 +1,25 @@ +angular.module('orderCloud') + .config(OrderDetailConfig) +; + +function OrderDetailConfig($stateProvider){ + $stateProvider + .state('orderDetail', { + url: '/order/:orderid', + parent: 'account', + templateUrl: 'orders/orderDetails/templates/orderDetails.html', + controller: 'OrderDetailCtrl', + controllerAs: 'orderDetails', + data: { + pageTitle: 'Order' + }, + resolve: { + SelectedOrder: function($stateParams, ocOrderDetail){ + return ocOrderDetail.GetOrderDetails($stateParams.orderid); + }, + OrderLineItems: function($stateParams, OrderCloud){ + return OrderCloud.LineItems.List($stateParams.orderid, null, 1, null, null, null, null, $stateParams.buyerid); + } + } + }); +} \ No newline at end of file diff --git a/src/app/orders/orderDetails/js/orderDetails.controller.js b/src/app/orders/orderDetails/js/orderDetails.controller.js new file mode 100644 index 00000000..a45cc178 --- /dev/null +++ b/src/app/orders/orderDetails/js/orderDetails.controller.js @@ -0,0 +1,25 @@ +angular.module('orderCloud') + .controller('OrderDetailCtrl', OrderDetailController) +; + +function OrderDetailController($stateParams, toastr, OrderCloud, ocOrders, SelectedOrder, OrderLineItems) { + var vm = this; + vm.order = SelectedOrder; + vm.lineItems = OrderLineItems; + + vm.pageChanged = function() { + return OrderCloud.LineItems.List($stateParams.orderid, null, vm.lineItems.Meta.Page, vm.lineItems.Meta.PageSize, null, null, null, $stateParams.buyerid) + .then(function(data) { + vm.lineItems = data; + }); + }; + + vm.loadMore = function() { + vm.lineItems.Meta.Page++; + return OrderCloud.LineItems.List($stateParams.orderid, null, vm.lineItems.Meta.Page, vm.lineItems.Meta.PageSize, null, null, null, $stateParams.buyerid) + .then(function(data) { + vm.lineItems.Items = vm.lineItems.Items.concat(data.Items); + vm.lineItem.Meta = data.Meta; + }); + }; +} \ No newline at end of file diff --git a/src/app/orders/orderDetails/templates/orderDetails.html b/src/app/orders/orderDetails/templates/orderDetails.html new file mode 100644 index 00000000..4a9ca25b --- /dev/null +++ b/src/app/orders/orderDetails/templates/orderDetails.html @@ -0,0 +1,137 @@ +<ul class="breadcrumb"> + <li><a href="" ui-sref="orders">All Orders</a></li> + <li class="active">{{orderDetails.order.ID}}</li> +</ul> +<article> + <header class="l-page-header"> + <h3 class="l-page-header__title"> + <small class="pull-right">Submitted on {{orderDetails.order.DateSubmitted | date}}</small> + <span class="text-muted">Order:</span> {{orderDetails.order.ID}} <br> + <span class="pull-right"><ordercloud-favorite-order current-user="base.currentUser" order="orderDetails.order"></ordercloud-favorite-order></span> + </h3> + </header> + <ul class="nav nav-tabs"> + <li ng-class="{active: application.$state.is('orderDetail')}"> + <a href="" ui-sref="orderDetail"><i class="fa fa-cube"></i> <span>Details</span></a> + </li> + <!--TODO: bring these back in as they become available--> + <!--<li ui-sref-active="active"> + <a href="" ui-sref=".payments"><i class="fa fa-dollar"></i> Payments</a> + </li> + <li ui-sref-active="active"> + <a href="" ui-sref=".shipments"><i class="fa fa-truck"></i> Shipments</a> + </li>--> + <!-- TODO: these roles seem incorrect in the api - fix when this is adjusted there --> + <li ui-sref-active="active" oc-if-roles="['ApprovalRuleAdmin', 'AddressReader']"> + <a href="" ui-sref=".approvals"><i class="fa fa-check-square-o"></i> Approvals</a> + </li> + </ul> + <br> + <div ui-view cg-busy="application.stateLoading('orderDetail')"> + <!--====== ORDER DETAILS ======--> + + <div class="panel panel-default"> + <div class="panel-body"> + <div class="row"> + <div class="col-sm-8"> + <b>Date {{orderDetails.order.DateSubmitted ? 'Submitted' : 'Created'}}: </b> {{(orderDetails.order.DateSubmitted || orderDetails.order.DateCreated) | date:'medium'}} <br> + <b>Status: </b> {{orderDetails.order.Status | humanize}} <br> + <b>Buyer Company: </b> {{orderDetails.order.FromCompany.Name}} <br> + <b>Created By: </b> {{orderDetails.order.FromUserFirstName + ' ' + orderDetails.order.FromUserLastName}} <br> + <div ng-if="orderDetails.order.Comments"> + <b>Comments: </b> {{orderDetails.order.Comments}} + </div> + </div> + <div class="col-sm-4"> + <span>Subtotal</span> <span class="pull-right">{{orderDetails.order.Subtotal | currency}}</span> <br> + <span>Shipping</span> <span class="pull-right">{{orderDetails.order.ShippingCost | currency}}</span> <br> + <span>Tax</span> <span class="pull-right">{{orderDetails.order.TaxCost | currency}}</span> + <hr> + <b>Total <span class="pull-right">{{orderDetails.order.Total | currency}}</span></b> + </div> + </div> + </div> + </div> + <div class="row"> + <div class="col-sm-6" ng-if="orderDetails.order.ShippingAddressID"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title">Shipping Address</h3> + </div> + <div class="panel-body"> + <div ng-bind-html="orderDetails.lineItems.Items[0].ShippingAddress | address:'full'"></div> + </div> + </div> + </div> + <div class="col-sm-6" ng-if="orderDetails.order.BillingAddressID"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title">Billing Address</h3> + </div> + <div class="panel-body"> + <div ng-bind-html="orderDetails.order.BillingAddress | address:'full'"></div> + </div> + </div> + </div> + </div> + + <!--====== LINE ITEM LIST ======--> + <div class="panel panel-default table-responsive"> + <table class="table table-striped table-bordered l-lineitem-table"> + <colgroup> + <col> + <col> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th>ID</th> + <th>Product</th> + <th ng-if="!orderDetails.order.ShippingAddressID">Shipping Address</th> + <th>Quantity</th> + <th>Unit Price</th> + <th>Line Total</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="lineItem in orderDetails.lineItems.Items"> + <td>{{lineItem.ID}}</td> + <td> + <a ui-sref="productDetail({productid: lineItem.ProductID})"> {{lineItem.Product.Name}}</a> + <small class="text-muted">({{lineItem.Product.ID}})</small> + <ul ng-if="lineItem.Specs.length > 0"> + <li ng-repeat="spec in lineItem.Specs"> + <small>{{spec.Name}}:</small> + <small>{{spec.Value}}</small> + </li> + </ul> + </td> + <td ng-if="!orderDetails.order.ShippingAddressID">{{lineItem.ShippingAddress | address}}</td> + <td>{{lineItem.Quantity}}</td> + <td>{{lineItem.UnitPrice | currency}}</td> + <td>{{lineItem.LineTotal | currency}}</td> + </tr> + </tbody> + </table> + </div> + + <!--====== LINE ITEM PAGINATION ======--> + <ul uib-pagination + class="pagination-sm pull-right hidden-xs" + ng-if="orderDetails.lineItems.Meta.TotalPages > 1" + total-items="orderDetails.lineItems.Meta.TotalCount" + items-per-page="orderDetails.lineItems.Meta.PageSize" + max-size="5" + boundary-links="orderDetails.lineItems.Meta.TotalPages > 5" + ng-model="orderDetails.lineItems.Meta.Page" + ng-change="orderDetails.pageChanged()"> + </ul> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="orderDetails.lineItems.Meta.Page < orderDetails.lineItems.Meta.TotalPages" + ng-click="orderDetails.loadMore()">Load More</button> + </div> +</article> \ No newline at end of file diff --git a/src/app/orders/orderList/js/oc-orders.service.js b/src/app/orders/orderList/js/oc-orders.service.js new file mode 100644 index 00000000..edcc6330 --- /dev/null +++ b/src/app/orders/orderList/js/oc-orders.service.js @@ -0,0 +1,60 @@ +angular.module('orderCloud') + .factory('ocOrders', ocOrdersService) +; + +function ocOrdersService(OrderCloud, $exceptionHandler){ + var service = { + List: _list + }; + + function _list(Parameters, CurrentUser){ + var parameters = angular.copy(Parameters); + parameters.filters = {Status: '!Unsubmitted'}; + + //set outgoing params to iso8601 format as expected by api + //set returning params to date object as expected by uib-datepicker + if(parameters.from) { + var fromDateObj = new Date(parameters.from); + Parameters.fromDate = fromDateObj; + parameters.from = (fromDateObj).toISOString(); + } + if(parameters.to) { + var toDateObj = new Date(parameters.to); + Parameters.toDate = toDateObj; + parameters.to = (toDateObj).toISOString(); + } + + // DateSubmitted calculated with from/to parameters + if(parameters.from && parameters.to) { + parameters.filters.DateSubmitted = [('>' + parameters.from), ('<' + parameters.to)]; + } else if(parameters.from && !parameters.to) { + parameters.filters.DateSubmitted = [('>' + parameters.from)]; + } else if (!parameters.from && parameters.to) { + parameters.filters.DateSubmitted = [('<' + parameters.to)]; + } + + // if(parameters.tab === 'history'){ + // // + // } + + // if(parameters.tab === 'approvals') { + // // + // } + + if(parameters.tab === 'favorites') { + + if(CurrentUser.xp && CurrentUser.xp.FavoriteOrders) { + angular.extend(parameters.filters, {ID: CurrentUser.xp.FavoriteOrders.join('|')}); + } + } + + //create filter object for outgoing call. We don't want to use filters directly + //in params because it looks ugly (displays as deserialized object) + + // list orders with generated parameters + var listType = parameters.tab === 'approvals' ? 'ListIncomingOrders' : 'ListOutgoingOrders'; + return OrderCloud.Me[listType](parameters.search, parameters.page, parameters.pageSize || 12, parameters.searchOn, parameters.sortBy, parameters.filters); + } + + return service; +} \ No newline at end of file diff --git a/src/app/orders/orderList/js/orders.config.js b/src/app/orders/orderList/js/orders.config.js new file mode 100644 index 00000000..5a97648c --- /dev/null +++ b/src/app/orders/orderList/js/orders.config.js @@ -0,0 +1,25 @@ +angular.module('orderCloud') + .config(OrdersConfig) +; + +function OrdersConfig($stateProvider) { + $stateProvider + .state('orders', { + parent: 'account', + templateUrl: 'orders/orderList/templates/orders.html', + controller: 'OrdersCtrl', + controllerAs: 'orders', + data: { + pageTitle: 'Orders' + }, + url: '/orders?from&to&search&page&pageSize&searchOn&sortBy&tab', + resolve: { + Parameters: function($stateParams, ocParameters){ + return ocParameters.Get($stateParams); + }, + OrderList: function(Parameters, CurrentUser, ocOrders){ + return ocOrders.List(Parameters, CurrentUser); + } + } + }); +} \ No newline at end of file diff --git a/src/app/orders/orderList/js/orders.controller.js b/src/app/orders/orderList/js/orders.controller.js new file mode 100644 index 00000000..ab2ca160 --- /dev/null +++ b/src/app/orders/orderList/js/orders.controller.js @@ -0,0 +1,106 @@ +angular.module('orderCloud') + .controller('OrdersCtrl', OrdersController) +; + +function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, ocOrders, OrderList, Parameters) { + var vm = this; + vm.list = OrderList; + vm.parameters = Parameters; + //need this here to display in uib-datepicker (as date obj) but short date (string) in url + vm.fromDate = Parameters.fromDate; + vm.toDate = Parameters.toDate; + + vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; + vm.filtersApplied = vm.parameters.fromDate || vm.parameters.toDate || ($ocMedia('max-width:767px') && vm.sortSelection); //Check if filters are applied, Sort by is a filter on mobile devices + vm.showFilters = vm.filtersApplied; + vm.searchResults = Parameters.search && Parameters.search.length > 0; //Check if search was used + + /* + Filter / Search / Sort / Pagination functions + */ + vm.filter = filter; //Reload the state with new parameters + vm.search = search; //Reload the state with new search parameter & reset the + vm.clearSearch = clearSearch; //Clear the search parameter, reload the state & reset the page + vm.clearFilters = clearFilters; //Clear relevant filters, reload the state & reset the page + vm.updateSort = updateSort; //Conditionally set, reverse, remove the sortBy parameter & reload the state + vm.reverseSort = reverseSort; //Used on mobile devices + vm.pageChanged = pageChanged; //Reload the state with the incremented page parameter + vm.loadMore = loadMore; //Load the next page of results with all of the same parameters, used on mobile + + vm.selectTab = selectTab; + vm.goToOrder = goToOrder; + + function selectTab(tab){ + vm.parameters.tab = tab; + vm.filter(true); + } + + function goToOrder(order){ + if(vm.parameters.tab === 'approvals') { + $state.go('orderDetail.approvals', {orderid: order.ID}); + } else { + $state.go('orderDetail', {orderid: order.ID}); + } + } + + function filter(resetPage) { + formatDate(); + $state.go('.', ocParameters.Create(vm.parameters, resetPage)); + } + + function formatDate(){ + //formats date as string to display in url + if(vm.fromDate) vm.parameters.from = $filter('date')(angular.copy(vm.fromDate), 'MM-dd-yyyy'); + if(vm.toDate) vm.parameters.to = $filter('date')(angular.copy(vm.toDate), 'MM-dd-yyyy'); + } + + function search() { + vm.filter(true); + } + + function clearSearch() { + vm.parameters.search = null; + vm.filter(true); + } + + function clearFilters() { + vm.parameters.status = null; + vm.parameters.coffeeshop = 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); + } + + function updateSort(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); + } + + function reverseSort() { + Parameters.sortBy.indexOf('!') == 0 ? vm.parameters.sortBy = Parameters.sortBy.split('!')[1] : vm.parameters.sortBy = '!' + Parameters.sortBy; + vm.filter(false); + } + + function pageChanged() { + $state.go('.', {page:vm.list.Meta.Page}); + } + + function loadMore() { + return ocOrders.ListOrders(vm.parameters) + .then(function(data){ + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + } +} \ No newline at end of file diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/orders/orderList/templates/orders.html new file mode 100644 index 00000000..8cd1852a --- /dev/null +++ b/src/app/orders/orderList/templates/orders.html @@ -0,0 +1,117 @@ +<article ui-view> + <header class="l-page-header"> + <h3 class="l-page-header__title"> + Orders + </h3> + <nav> + <ul class="nav nav-tabs aveda-nav-tabs"> + <li role="presentation" ng-class="{active: orders.parameters.tab == 'history'}"><a ng-click="orders.selectTab('history')">Order History</a></li> + <li role="presentation" ng-class="{active: orders.parameters.tab == 'pending'}"><a ng-click="orders.selectTab('approvals')">Awaiting Approval</a></li> + <li role="presentation" ng-class="{active: orders.parameters.tab == 'favorites'}"><a ng-click="orders.selectTab('favorites')">Favorite Orders</a></li> + </ul> + </nav> + </header> + <br> + + <!--====== SEARCH ======--> + <form name="OrdersSearchForm" pretty-submit> + <fieldset class="form-group"> + <div class="input-group"> + <span class="input-group-addon"> + <i class="fa fa-search"></i> + </span> + <input type="search" ng-change="orders.search()" ng-model-options="{debounce:1000}" placeholder="Search orders..." ng-model="orders.parameters.search" class="form-control"> + <span ng-if="orders.searchResults" class="input-group-btn"> + <button class="btn btn-default" type="button" aria-label="Clear Search" ng-click="orders.clearSearch()"><i class="fa fa-times"></i> <span class="hidden-xs">Clear Search</span></button> + </span> + </div> + </fieldset> + </form> + <!--====== FILTERS ======--> + <form name="OrdersFiltersForm"> + <div class="row"> + <div class="col-sm-3 form-group"> + <label for="FromDate">From Date</label> + <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.fromDate" ng-blur="orders.filter(true)"> + <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> + </div> + <div class="col-sm-3 form-group"> + <label for="ToDate">To Date</label> + <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.toDate" ng-blur="orders.filter(true)"> + <input id="ToDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.fromDate}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> + </div> + </div> + </form> + + <!--====== LIST ======--> + <div cg-busy="orders.searchLoading"> + <div class="no-matches" ng-if="!orders.list.Items.length"> + <b>{{orders.filtersApplied || orders.searchResults ? 'No matches found' : 'No orders'}}</b> + </div> + <div ng-if="orders.list.Items.length"> + <div class="text-right"> + <p>{{(application.$ocMedia('min-width:768px') ? orders.list.Meta.ItemRange[0] : '1') + ' - ' + + orders.list.Meta.ItemRange[1] + ' of ' + orders.list.Meta.TotalCount + ' results'}}</p> + </div> + <div class="panel panel-default table-responsive"> + <table class="table table-striped table-bordered l-order-table"> + <colgroup> + <col> + <col> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th ng-click="orders.updateSort('ID')"> + ID + <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'ID'"></i> + <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!ID'"></i> + </th> + <th ng-click="orders.updateSort('DateSubmitted')"> + Submitted + <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'DateSubmitted'"></i> + <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!DateSubmitted'"></i> + </th> + <th ng-click="orders.updateSort('FromUserFirstName')"> + Submitted By + <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'FromUserFirstName'"></i> + <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!FromUserFirstName'"></i> + </th> + <th ng-click="orders.updateSort('Subtotal')"> + Subtotal + <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'Subtotal'"></i> + <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!Subtotal'"></i> + </th> + </tr> + </thead> + <tbody> + <tr ng-repeat="order in orders.list.Items"> + <td><a ng-click="orders.goToOrder(order)">{{order.ID}}</a></td> + <td>{{(order.DateSubmitted || order.DateCreated) | date:'short'}}</td> + <td>{{order.FromUserFirstName + ' ' + order.FromUserLastName}}</td> + <td>{{order.Subtotal | currency}}</td> + </tr> + </tbody> + </table> + </div> + <ul uib-pagination + class="pagination-sm pull-right hidden-xs" + ng-if="orders.list.Meta.TotalPages > 1" + total-items="orders.list.Meta.TotalCount" + items-per-page="orders.list.Meta.PageSize" + max-size="5" + boundary-links="orders.list.Meta.TotalPages > 5" + ng-model="orders.list.Meta.Page" + ng-change="orders.pageChanged()"> + </ul> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="orders.list.Meta.Page < orders.list.Meta.TotalPages" + ng-click="orders.loadMore()">Load More</button> + </div> + </div> + +</article> \ No newline at end of file diff --git a/src/app/myOrders/tests/myOrders.spec.js b/src/app/orders/tests/myOrders.spec.js similarity index 100% rename from src/app/myOrders/tests/myOrders.spec.js rename to src/app/orders/tests/myOrders.spec.js diff --git a/src/app/myOrders/tests/myOrders.test.js b/src/app/orders/tests/myOrders.test.js similarity index 100% rename from src/app/myOrders/tests/myOrders.test.js rename to src/app/orders/tests/myOrders.test.js From b852c16bbf0101676f526672ebc806a388bba190 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Sun, 19 Mar 2017 15:57:22 -0500 Subject: [PATCH 034/158] OC-2048 add back in order statuses --- src/app/orders/orderList/js/orders.controller.js | 7 +++++++ src/app/orders/orderList/templates/orders.html | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/app/orders/orderList/js/orders.controller.js b/src/app/orders/orderList/js/orders.controller.js index ab2ca160..e8bc097e 100644 --- a/src/app/orders/orderList/js/orders.controller.js +++ b/src/app/orders/orderList/js/orders.controller.js @@ -10,6 +10,13 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o vm.fromDate = Parameters.fromDate; vm.toDate = Parameters.toDate; + vm.orderStatuses = [ + {Value: 'Open', Name: 'Open'}, + {Value: 'AwaitingApproval', Name: 'Awaiting Approval'}, + {Value: 'Completed', Name: 'Completed'}, + {Value: 'Declined', Name: 'Declined'} + ]; + vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; vm.filtersApplied = vm.parameters.fromDate || vm.parameters.toDate || ($ocMedia('max-width:767px') && vm.sortSelection); //Check if filters are applied, Sort by is a filter on mobile devices vm.showFilters = vm.filtersApplied; diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/orders/orderList/templates/orders.html index 8cd1852a..d818258b 100644 --- a/src/app/orders/orderList/templates/orders.html +++ b/src/app/orders/orderList/templates/orders.html @@ -30,6 +30,12 @@ <h3 class="l-page-header__title"> <!--====== FILTERS ======--> <form name="OrdersFiltersForm"> <div class="row"> + <div class="col-sm-3 form-group"> + <label for="Status">Status</label> + <select id="Status" class="form-control" ng-model="orders.parameters.status" ng-options="status.Value as status.Name for status in orders.orderStatuses" ng-change="orders.filter(true)"> + <option value="">All</option> + </select> + </div> <div class="col-sm-3 form-group"> <label for="FromDate">From Date</label> <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.fromDate" ng-blur="orders.filter(true)"> @@ -70,6 +76,11 @@ <h3 class="l-page-header__title"> <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'ID'"></i> <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!ID'"></i> </th> + <th ng-click="orders.updateSort('Status')"> + Status + <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'Status'"></i> + <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!Status'"></i> + </th> <th ng-click="orders.updateSort('DateSubmitted')"> Submitted <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'DateSubmitted'"></i> @@ -90,6 +101,7 @@ <h3 class="l-page-header__title"> <tbody> <tr ng-repeat="order in orders.list.Items"> <td><a ng-click="orders.goToOrder(order)">{{order.ID}}</a></td> + <td>{{order.Status | humanize}}</td> <td>{{(order.DateSubmitted || order.DateCreated) | date:'short'}}</td> <td>{{order.FromUserFirstName + ' ' + order.FromUserLastName}}</td> <td>{{order.Subtotal | currency}}</td> From 1baaf0ad3eaa0d0a7e78da143b05208a67a03962 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Sun, 19 Mar 2017 15:57:44 -0500 Subject: [PATCH 035/158] OC-2048 fix link to order detail --- .../confirmation/templates/checkout.confirmation.tpl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html b/src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html index da1befe8..729e577b 100644 --- a/src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html +++ b/src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html @@ -1,7 +1,7 @@ <article> <h2 class="page-header"> Order Submitted <br> - <small>Thank you for your order. Check your <a href="" ui-sref="myOrders.detail({orderid:checkoutConfirmation.order.ID})">order history</a> to track your delivery!</small> + <small>Thank you for your order. Check your <a href="" ui-sref="orderDetail({orderid:checkoutConfirmation.order.ID})">order history</a> to track your delivery!</small> </h2> <div class="row"> <div class="col-md-5"> From d7b43cb955cd5683d426a55e536927d45a752b6e Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Sun, 19 Mar 2017 15:59:30 -0500 Subject: [PATCH 036/158] OC-2049 only show approve/decline buttons if the current user is eligible to approve order --- src/app/orders/orderApprovals/js/orderApprovals.config.js | 7 +++++++ .../orders/orderApprovals/js/orderApprovals.controller.js | 5 +++-- .../orders/orderApprovals/templates/orderApprovals.html | 8 ++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/app/orders/orderApprovals/js/orderApprovals.config.js b/src/app/orders/orderApprovals/js/orderApprovals.config.js index 5bbbbcad..6f6d6ea2 100644 --- a/src/app/orders/orderApprovals/js/orderApprovals.config.js +++ b/src/app/orders/orderApprovals/js/orderApprovals.config.js @@ -15,6 +15,13 @@ function ApprovalsConfig($stateProvider){ resolve: { OrderApprovals: function($stateParams, ocApprovals) { return ocApprovals.List($stateParams.orderid, $stateParams.buyerid, 1, 100); + }, + CanApprove: function(CurrentUser, $stateParams, OrderCloud){ + return OrderCloud.Orders.ListEligibleApprovers($stateParams.orderid, null, 1, 100) + .then(function(userList){ + var userIDs = _.pluck(userList.Items, 'ID'); + return userIDs.indexOf(CurrentUser.ID) > -1; + }); } } }); diff --git a/src/app/orders/orderApprovals/js/orderApprovals.controller.js b/src/app/orders/orderApprovals/js/orderApprovals.controller.js index a3c94086..e93543a7 100644 --- a/src/app/orders/orderApprovals/js/orderApprovals.controller.js +++ b/src/app/orders/orderApprovals/js/orderApprovals.controller.js @@ -3,9 +3,10 @@ angular.module('orderCloud') .controller('ApprovalModalCtrl', ApprovalModalController) ; -function OrderApprovalsController(OrderApprovals, OrderCloud, ocApprovals, $stateParams) { +function OrderApprovalsController(OrderApprovals, CanApprove, OrderCloud, ocApprovals, $stateParams) { var vm = this; vm.list = OrderApprovals; + vm.canApprove = CanApprove; vm.pageChanged = function() { ocApprovals.List($stateParams.orderid, $stateParams.buyerid, vm.list.Meta.Page, vm.list.Meta.PageSize) @@ -33,7 +34,7 @@ function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalIn var vm = this; vm.intent = Intent; // 'Approve' or 'Decline' vm.orderid = OrderID; - vm.comments = ''; + vm.comments = null; vm.cancel = cancel; vm.submit = submit; diff --git a/src/app/orders/orderApprovals/templates/orderApprovals.html b/src/app/orders/orderApprovals/templates/orderApprovals.html index e5365437..9398dea3 100644 --- a/src/app/orders/orderApprovals/templates/orderApprovals.html +++ b/src/app/orders/orderApprovals/templates/orderApprovals.html @@ -15,15 +15,15 @@ <th>Approving User Group</th> <th>Approval Rule Name</th> <th>Approval Rule Description</th> - <th></th> + <th ng-if="orderApprovals.canApprove"></th> </tr> </thead> <tbody> <tr ng-repeat="approval in orderApprovals.list.Items| filter:{Status:'Pending'}"> <td>{{approval.ApprovingUserGroup.Name}}</td> <td>{{approval.ApprovalRule.Name}}</td> - <td ng-bind-html="approval.ApprovalRule.Description" style="white-space: pre-wrap"></td> - <th> + <td ng-bind-html="approval.ApprovalRule.Description" style="white-space: pre-wrap">{{orderApprovals.canApprove}}</td> + <th ng-if="orderApprovals.canApprove"> <button class="btn btn-sm btn-primary btn-block" ng-click="orderApprovals.updateApprovalStatus('Approve')">Approve</button> <button class="btn btn-sm btn-danger btn-block" ng-click="orderApprovals.updateApprovalStatus('Decline')">Decline</button> </th> @@ -80,7 +80,7 @@ </thead> <tbody> <tr ng-repeat="approval in orderApprovals.list.Items| filter:{Status:'Declined'}"> - <td>{{approval.ApproverUserName}}</td> + <td>{{approval.ApprovingUser.FirstName + ' ' + approval.ApprovingUser.LastName}}</td> <td>{{approval.DateCompleted | date:'short'}}</td> <td>{{approval.Comments}}</td> <td>{{approval.ApprovalRule.Name}}</td> From 1012a7134119d7d8d5dabf0a0f09acbbd3ff7330 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Sun, 19 Mar 2017 16:03:54 -0500 Subject: [PATCH 037/158] OC-2048 clean up code --- .../orderDetails/js/oc-orderDetails.service.js | 2 +- .../orders/orderList/js/oc-orders.service.js | 18 ++++++------------ src/app/orders/orderList/js/orders.config.js | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/app/orders/orderDetails/js/oc-orderDetails.service.js b/src/app/orders/orderDetails/js/oc-orderDetails.service.js index c68a7354..ac644201 100644 --- a/src/app/orders/orderDetails/js/oc-orderDetails.service.js +++ b/src/app/orders/orderDetails/js/oc-orderDetails.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrderDetail', ocOrderDetailService) ; -function ocOrderDetailService($q, $exceptionHandler, OrderCloud, $uibModal){ +function ocOrderDetailService($q, $exceptionHandler, OrderCloud){ var service = { GetOrderDetails: _getOrderDetails }; diff --git a/src/app/orders/orderList/js/oc-orders.service.js b/src/app/orders/orderList/js/oc-orders.service.js index edcc6330..f19024fd 100644 --- a/src/app/orders/orderList/js/oc-orders.service.js +++ b/src/app/orders/orderList/js/oc-orders.service.js @@ -2,13 +2,15 @@ angular.module('orderCloud') .factory('ocOrders', ocOrdersService) ; -function ocOrdersService(OrderCloud, $exceptionHandler){ +function ocOrdersService(OrderCloud){ var service = { List: _list }; function _list(Parameters, CurrentUser){ var parameters = angular.copy(Parameters); + + //exclude unsubmitted orders from list parameters.filters = {Status: '!Unsubmitted'}; //set outgoing params to iso8601 format as expected by api @@ -33,23 +35,15 @@ function ocOrdersService(OrderCloud, $exceptionHandler){ parameters.filters.DateSubmitted = [('<' + parameters.to)]; } - // if(parameters.tab === 'history'){ - // // - // } - - // if(parameters.tab === 'approvals') { - // // - // } - if(parameters.tab === 'favorites') { - if(CurrentUser.xp && CurrentUser.xp.FavoriteOrders) { angular.extend(parameters.filters, {ID: CurrentUser.xp.FavoriteOrders.join('|')}); } } - //create filter object for outgoing call. We don't want to use filters directly - //in params because it looks ugly (displays as deserialized object) + if(parameters.status){ + angular.extend(parameters.filters, {Status: parameters.status}); + } // list orders with generated parameters var listType = parameters.tab === 'approvals' ? 'ListIncomingOrders' : 'ListOutgoingOrders'; diff --git a/src/app/orders/orderList/js/orders.config.js b/src/app/orders/orderList/js/orders.config.js index 5a97648c..055e2c88 100644 --- a/src/app/orders/orderList/js/orders.config.js +++ b/src/app/orders/orderList/js/orders.config.js @@ -12,7 +12,7 @@ function OrdersConfig($stateProvider) { data: { pageTitle: 'Orders' }, - url: '/orders?from&to&search&page&pageSize&searchOn&sortBy&tab', + url: '/orders?from&to&search&page&pageSize&searchOn&sortBy&tab?status', resolve: { Parameters: function($stateParams, ocParameters){ return ocParameters.Get($stateParams); From de5b4a89552b97ecf34b5f4d15ca0fd5b0a810a1 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Sun, 19 Mar 2017 16:04:43 -0500 Subject: [PATCH 038/158] OC-2048 each tab now has a custom message for when there are no orders --- src/app/orders/orderList/templates/orders.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/orders/orderList/templates/orders.html index d818258b..6ba6fae8 100644 --- a/src/app/orders/orderList/templates/orders.html +++ b/src/app/orders/orderList/templates/orders.html @@ -52,7 +52,15 @@ <h3 class="l-page-header__title"> <!--====== LIST ======--> <div cg-busy="orders.searchLoading"> <div class="no-matches" ng-if="!orders.list.Items.length"> - <b>{{orders.filtersApplied || orders.searchResults ? 'No matches found' : 'No orders'}}</b> + <span ng-if="!orders.parameters.tab || orders.parameters.tab == 'history'"> + <b>{{orders.filtersApplied || orders.searchResults ? 'No matches found' : 'No orders'}}</b> + </span> + <span ng-if="orders.parameters.tab == 'approvals'"> + <b>{{orders.filtersApplied || orders.searchResults ? 'No matches found' : 'No orders awaiting your approval'}}</b> + </span> + <span ng-if="orders.parameters.tab == 'favorites'"> + <b>{{orders.filtersApplied || orders.searchResults ? 'No matches found' : 'No orders have been favorited'}}</b> + </span> </div> <div ng-if="orders.list.Items.length"> <div class="text-right"> From 8638859e5e863aa3724abfd33dc872899a72604f Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Mon, 20 Mar 2017 11:36:36 -0500 Subject: [PATCH 039/158] OC-2048 add unit tests for order details. adjust some of actual code to make testing easier --- .../js/oc-orderDetails.service.js | 8 +- .../orderDetails/js/orderDetails.config.js | 6 +- .../js/orderDetails.controller.js | 4 +- .../orderDetails/tests/orderDetails.spec.js | 99 +++++++++++++++++++ 4 files changed, 108 insertions(+), 9 deletions(-) create mode 100644 src/app/orders/orderDetails/tests/orderDetails.spec.js diff --git a/src/app/orders/orderDetails/js/oc-orderDetails.service.js b/src/app/orders/orderDetails/js/oc-orderDetails.service.js index ac644201..f03b0845 100644 --- a/src/app/orders/orderDetails/js/oc-orderDetails.service.js +++ b/src/app/orders/orderDetails/js/oc-orderDetails.service.js @@ -1,13 +1,13 @@ angular.module('orderCloud') - .factory('ocOrderDetail', ocOrderDetailService) + .factory('ocOrderDetails', ocOrderDetailsService) ; -function ocOrderDetailService($q, $exceptionHandler, OrderCloud){ +function ocOrderDetailsService($q, $exceptionHandler, OrderCloud){ var service = { - GetOrderDetails: _getOrderDetails + Get: _get }; - function _getOrderDetails(orderID){ + function _get(orderID){ return OrderCloud.Orders.Get(orderID) .then(function(order){ return getBuyerOrg(order); diff --git a/src/app/orders/orderDetails/js/orderDetails.config.js b/src/app/orders/orderDetails/js/orderDetails.config.js index 6b5b5b27..dd48b1a2 100644 --- a/src/app/orders/orderDetails/js/orderDetails.config.js +++ b/src/app/orders/orderDetails/js/orderDetails.config.js @@ -8,14 +8,14 @@ function OrderDetailConfig($stateProvider){ url: '/order/:orderid', parent: 'account', templateUrl: 'orders/orderDetails/templates/orderDetails.html', - controller: 'OrderDetailCtrl', + controller: 'OrderDetailsCtrl', controllerAs: 'orderDetails', data: { pageTitle: 'Order' }, resolve: { - SelectedOrder: function($stateParams, ocOrderDetail){ - return ocOrderDetail.GetOrderDetails($stateParams.orderid); + SelectedOrder: function($stateParams, ocOrderDetails){ + return ocOrderDetails.Get($stateParams.orderid); }, OrderLineItems: function($stateParams, OrderCloud){ return OrderCloud.LineItems.List($stateParams.orderid, null, 1, null, null, null, null, $stateParams.buyerid); diff --git a/src/app/orders/orderDetails/js/orderDetails.controller.js b/src/app/orders/orderDetails/js/orderDetails.controller.js index a45cc178..38caf293 100644 --- a/src/app/orders/orderDetails/js/orderDetails.controller.js +++ b/src/app/orders/orderDetails/js/orderDetails.controller.js @@ -1,8 +1,8 @@ angular.module('orderCloud') - .controller('OrderDetailCtrl', OrderDetailController) + .controller('OrderDetailsCtrl', OrderDetailsController) ; -function OrderDetailController($stateParams, toastr, OrderCloud, ocOrders, SelectedOrder, OrderLineItems) { +function OrderDetailsController($stateParams, OrderCloud, SelectedOrder, OrderLineItems) { var vm = this; vm.order = SelectedOrder; vm.lineItems = OrderLineItems; diff --git a/src/app/orders/orderDetails/tests/orderDetails.spec.js b/src/app/orders/orderDetails/tests/orderDetails.spec.js new file mode 100644 index 00000000..4b90496f --- /dev/null +++ b/src/app/orders/orderDetails/tests/orderDetails.spec.js @@ -0,0 +1,99 @@ +fdescribe('Component: orders', function() { + var scope, + q, + oc, + _ocOrderDetails, + mockOrderID, + mockBuyerID, + mockCurrentUser, + mockParams, + stateParams + ; + beforeEach(module(function($provide) { + mockCurrentUser = 'CurrentUser123'; + mockOrderID = 'OrderID123'; + mockBuyerID = 'Buyer123'; + mockParams = {search:null, page: null, pageSize: null, searchOn: null, sortBy: null, filters: null, from: null, to: null, favorites: null}; + stateParams = {buyerid: mockBuyerID, orderid: mockOrderID}; + $provide.value('CurrentUser', mockCurrentUser); + $provide.value('Parameters', mockParams); + })); + beforeEach(module('orderCloud')); + beforeEach(module('orderCloud.sdk')); + beforeEach(inject(function($q, $rootScope, OrderCloud, ocParameters, ocOrderDetails) { + q = $q; + scope = $rootScope.$new(); + oc = OrderCloud; + _ocOrderDetails = ocOrderDetails; + })); + + + + describe('State: orderDetails', function() { + var state + ; + beforeEach(inject(function($state, $stateParams) { + $stateParams.orderid = stateParams.orderid; + $stateParams.buyerid = stateParams.buyerid; + state = $state.get('orderDetail'); + spyOn(_ocOrderDetails, 'Get'); + spyOn(oc.LineItems, 'List'); + })); + it('should resolve SelectedOrder', inject(function($injector){ + $injector.invoke(state.resolve.SelectedOrder); + expect(_ocOrderDetails.Get).toHaveBeenCalledWith(mockOrderID); + })); + it('should resolve OrderLineItems', inject(function($injector) { + $injector.invoke(state.resolve.OrderLineItems); + expect(oc.LineItems.List).toHaveBeenCalledWith(mockOrderID, null, 1, null, null, null, null, mockBuyerID); + })); + }); + + + + describe('Controller: OrdersCtrl', function(){ + var orderDetailsCtrl, + mockMeta, + mockResponse + ; + beforeEach(inject(function($controller, $stateParams){ + $stateParams = stateParams; + mockMeta = {Page: 2, PageSize: 15}; + mockResponse = {Items: [{Name: 'LineItem2'}, {Name:'LineItem3'}], Meta: mockMeta}; + + orderDetailsCtrl = $controller('OrderDetailsCtrl', { + $stateParams: $stateParams, + OrderCloud: oc, + SelectedOrder: {ID: 'Order123', Name:'mockSelectedOrder'}, + OrderLineItems: {Meta: {Page: 1, PageSize: 12}, Items: [{Name: 'LineItem1'}] } + }); + + var defer = q.defer(); + defer.resolve(mockResponse); + spyOn(oc.LineItems, 'List').and.returnValue(defer.promise); + })); + + + describe('pageChanged', function(){ + it('should reload state with page from vm.lineItems.Meta.Page', function(){ + var mockPage = 3; + orderDetailsCtrl.lineItems.Meta.Page = mockPage; + orderDetailsCtrl.pageChanged(); + expect(oc.LineItems.List).toHaveBeenCalledWith(mockOrderID, null, mockPage, 12, null, null, null, mockBuyerID); + }); + }); + + + describe('loadMore', function(){ + it('should concatenate next page of results with current list items', function(){ + var nextPage = orderDetailsCtrl.lineItems.Meta.Page + 1; + orderDetailsCtrl.loadMore(); + expect(oc.LineItems.List).toHaveBeenCalledWith(mockOrderID, null, nextPage, 12, null, null, null, mockBuyerID); + scope.$digest(); + expect(orderDetailsCtrl.lineItems.Meta.Page).toBe(nextPage); + expect(orderDetailsCtrl.lineItems.Items).toEqual([{Name:'LineItem1'}, {Name: 'LineItem2'}, {Name:'LineItem3'}]); + }); + }); + }); +}); + From f5a1f52e84b09106080aea5fd4c593ab4fbece59 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Mon, 20 Mar 2017 11:37:52 -0500 Subject: [PATCH 040/158] unit tests for order list. order list now has its own folder, moved tests there --- .../orders/orderList/js/orders.controller.js | 13 +- .../orders/orderList/templates/orders.html | 2 +- src/app/orders/orderList/tests/orders.spec.js | 177 +++++++++++++ src/app/orders/tests/myOrders.spec.js | 236 ------------------ src/app/orders/tests/myOrders.test.js | 0 5 files changed, 180 insertions(+), 248 deletions(-) create mode 100644 src/app/orders/orderList/tests/orders.spec.js delete mode 100644 src/app/orders/tests/myOrders.spec.js delete mode 100644 src/app/orders/tests/myOrders.test.js diff --git a/src/app/orders/orderList/js/orders.controller.js b/src/app/orders/orderList/js/orders.controller.js index e8bc097e..856fa756 100644 --- a/src/app/orders/orderList/js/orders.controller.js +++ b/src/app/orders/orderList/js/orders.controller.js @@ -28,12 +28,12 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o vm.filter = filter; //Reload the state with new parameters vm.search = search; //Reload the state with new search parameter & reset the vm.clearSearch = clearSearch; //Clear the search parameter, reload the state & reset the page - vm.clearFilters = clearFilters; //Clear relevant filters, reload the state & reset the page vm.updateSort = updateSort; //Conditionally set, reverse, remove the sortBy parameter & reload the state vm.reverseSort = reverseSort; //Used on mobile devices vm.pageChanged = pageChanged; //Reload the state with the incremented page parameter vm.loadMore = loadMore; //Load the next page of results with all of the same parameters, used on mobile + vm.formatDate = formatDate; vm.selectTab = selectTab; vm.goToOrder = goToOrder; @@ -70,15 +70,6 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o vm.filter(true); } - function clearFilters() { - vm.parameters.status = null; - vm.parameters.coffeeshop = 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); - } - function updateSort(value) { value ? angular.noop() : value = vm.sortSelection; switch(vm.parameters.sortBy) { @@ -104,7 +95,7 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o } function loadMore() { - return ocOrders.ListOrders(vm.parameters) + return ocOrders.List(vm.parameters) .then(function(data){ vm.list.Items = vm.list.Items.concat(data.Items); vm.list.Meta = data.Meta; diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/orders/orderList/templates/orders.html index 6ba6fae8..f445b70a 100644 --- a/src/app/orders/orderList/templates/orders.html +++ b/src/app/orders/orderList/templates/orders.html @@ -6,7 +6,7 @@ <h3 class="l-page-header__title"> <nav> <ul class="nav nav-tabs aveda-nav-tabs"> <li role="presentation" ng-class="{active: orders.parameters.tab == 'history'}"><a ng-click="orders.selectTab('history')">Order History</a></li> - <li role="presentation" ng-class="{active: orders.parameters.tab == 'pending'}"><a ng-click="orders.selectTab('approvals')">Awaiting Approval</a></li> + <li role="presentation" ng-class="{active: orders.parameters.tab == 'approvals'}"><a ng-click="orders.selectTab('approvals')">Awaiting Approval</a></li> <li role="presentation" ng-class="{active: orders.parameters.tab == 'favorites'}"><a ng-click="orders.selectTab('favorites')">Favorite Orders</a></li> </ul> </nav> diff --git a/src/app/orders/orderList/tests/orders.spec.js b/src/app/orders/orderList/tests/orders.spec.js new file mode 100644 index 00000000..7b86ad52 --- /dev/null +++ b/src/app/orders/orderList/tests/orders.spec.js @@ -0,0 +1,177 @@ +describe('Component: orders', function() { + var scope, + q, + oc, + _ocParameters, + _ocOrders, + mockParams, + currentUser, + state + ; + beforeEach(module(function($provide) { + mockParams = {search:null, page: null, pageSize: null, searchOn: null, sortBy: null, filters: null, from: null, to: null, favorites: null}; + currentUser = {Name: 'mockUserName', ID: 'mockUser123'}; + $provide.value('Parameters', mockParams); + $provide.value('CurrentUser', currentUser); + })); + beforeEach(module('orderCloud')); + beforeEach(module('orderCloud.sdk')); + beforeEach(inject(function($q, $rootScope, OrderCloud, ocParameters, ocOrders, CurrentUser, $state) { + q = $q; + scope = $rootScope.$new(); + oc = OrderCloud; + _ocParameters = ocParameters; + _ocOrders = ocOrders; + state = $state; + })); + + + + describe('State: orders', function() { + var state; + var parameters; + var currentUser; + beforeEach(inject(function($state, Parameters, CurrentUser) { + state = $state.get('orders'); + parameters = Parameters; + currentUser = CurrentUser; + spyOn(_ocParameters, 'Get'); + spyOn(_ocOrders, 'List'); + })); + it('should resolve Parameters', inject(function($injector){ + $injector.invoke(state.resolve.Parameters); + expect(_ocParameters.Get).toHaveBeenCalled(); + })); + it('should resolve OrderList', inject(function($injector) { + $injector.invoke(state.resolve.OrderList); + expect(_ocOrders.List).toHaveBeenCalledWith(parameters, currentUser); + })); + }); + + + + describe('Controller: OrdersCtrl', function(){ + var ordersCtrl, + ocMedia + ; + beforeEach(inject(function($controller, $ocMedia, Parameters){ + ocMedia = $ocMedia; + ordersCtrl = $controller('OrdersCtrl', { + $state: state, + $ocMedia: ocMedia, + OrderCloud: oc, + ocParameters: _ocParameters, + OrderList: [], + Parameters: Parameters + }); + spyOn(_ocParameters, 'Create'); + spyOn(state, 'go'); + spyOn(ordersCtrl, 'filter'); + ordersCtrl.list = {Items: 'Item1', Meta: {Page: 1, PageSize: 12}}; + })); + + + describe('selectTab', function(){ + it('set tab and then call vm.filter to reload state', function(){ + var mockTab = 'favorites'; + ordersCtrl.selectTab(mockTab); + expect(mockParams.tab).toBe(mockTab); + expect(ordersCtrl.filter).toHaveBeenCalledWith(true); + }); + }); + + + describe('search', function(){ + it('should call vm.filter to reload state', function(){ + ordersCtrl.search(); + expect(ordersCtrl.filter).toHaveBeenCalledWith(true); + }); + }); + + + describe('clearSearch', function(){ + it('should clear search parameters and then reload state', function(){ + ordersCtrl.clearSearch(); + expect(mockParams.search).toBeNull(); + expect(ordersCtrl.filter).toHaveBeenCalledWith(true); + }); + }); + + + describe('reverseSort', function(){ + it('if param.sortBy is !something it should reload state with param.sortBy equal to something', function(){ + mockParams.sortBy = '!Something'; + ordersCtrl.reverseSort(); + + expect(mockParams.sortBy).toBe('Something'); + expect(ordersCtrl.filter).toHaveBeenCalledWith(false); + }), + it('if param.sortBy is something it should reload state with param.sortBy equal to !something', function(){ + mockParams.sortBy = 'Something'; + ordersCtrl.reverseSort(); + + expect(mockParams.sortBy).toBe('!Something'); + expect(ordersCtrl.filter).toHaveBeenCalledWith(false); + }); + }); + + + describe('pageChanged', function(){ + it('should reload state with page from vm.list.Meta.Page', function(){ + var mockPage = 3; + ordersCtrl.list.Meta.Page = 3; + + ordersCtrl.pageChanged(); + expect(state.go).toHaveBeenCalledWith('.', {page: mockPage}); + }); + }); + + + describe('loadMore', function(){ + var mockMeta; + beforeEach(function(){ + mockMeta = {Page: 2, PageSize: 15}; + ordersCtrl.list.Items = [{Name: 'FirstOrder'}, {Name:'SecondOrder'}]; + var mockResponse = {Items: [{Name:'ThirdOrder'}], Meta: mockMeta}; + + var defer = q.defer(); + defer.resolve(mockResponse); + + spyOn(_ocOrders, 'List').and.returnValue(defer.promise); + ordersCtrl.loadMore(); + }); + it('should concatenate next page of results with current list items', function(){ + expect(_ocOrders.List).toHaveBeenCalledWith(mockParams); + scope.$digest(); + //use toEqual for comparing objects (does deep equality check) + expect(ordersCtrl.list.Items).toEqual([{Name: 'FirstOrder'}, {Name:'SecondOrder'}, {Name:'ThirdOrder'}]); + expect(ordersCtrl.list.Meta).toEqual(mockMeta); + }); + }); + }); + + describe('Service: ocOrders', function() { + beforeEach(inject(function(){ + var defer = q.defer(); + defer.resolve(); + spyOn(_ocOrders, 'List').and.returnValue(defer.promise); + spyOn(oc.Me, 'ListIncomingOrders').and.returnValue(defer.promise); + spyOn(oc.Me, 'ListOutgoingOrders').and.returnValue(defer.promise); + })); + + + it('should define methods', function(){ + expect(_ocOrders.List).toBeDefined(); + expect(_ocOrders.List).toEqual(jasmine.any(Function)); + }); + + //TODO: Finish Unit tests: unit testing services didn't work like I thought it would + // it('should default to excluding unsubmitted orders if no status provided', function() { + // _ocOrders.List(mockParams, currentUser); + // scope.$digest(); + // expect(oc.Me.ListOutgoingOrders).toHaveBeenCalled(); + // // expect(orderCloud.Me.ListIncomingOrders).toHaveBeenCalled(); + // }); + }); +}); + diff --git a/src/app/orders/tests/myOrders.spec.js b/src/app/orders/tests/myOrders.spec.js deleted file mode 100644 index 66fb9d54..00000000 --- a/src/app/orders/tests/myOrders.spec.js +++ /dev/null @@ -1,236 +0,0 @@ -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).toHaveBeenCalled(); - }); - 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/orders/tests/myOrders.test.js b/src/app/orders/tests/myOrders.test.js deleted file mode 100644 index e69de29b..00000000 From 5acd73429dfe1fb8719bfa7acb0d42285e451457 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Mon, 20 Mar 2017 13:09:56 -0500 Subject: [PATCH 041/158] OC-2049 add unit tests for orderApprovals --- .../js/orderApprovals.controller.js | 2 +- .../tests/orderApprovals.spec.js | 177 ++++++++++++++++++ .../orderDetails/tests/orderDetails.spec.js | 11 +- 3 files changed, 184 insertions(+), 6 deletions(-) create mode 100644 src/app/orders/orderApprovals/tests/orderApprovals.spec.js diff --git a/src/app/orders/orderApprovals/js/orderApprovals.controller.js b/src/app/orders/orderApprovals/js/orderApprovals.controller.js index e93543a7..8363329b 100644 --- a/src/app/orders/orderApprovals/js/orderApprovals.controller.js +++ b/src/app/orders/orderApprovals/js/orderApprovals.controller.js @@ -3,7 +3,7 @@ angular.module('orderCloud') .controller('ApprovalModalCtrl', ApprovalModalController) ; -function OrderApprovalsController(OrderApprovals, CanApprove, OrderCloud, ocApprovals, $stateParams) { +function OrderApprovalsController($stateParams, OrderCloud, ocApprovals, OrderApprovals, CanApprove) { var vm = this; vm.list = OrderApprovals; vm.canApprove = CanApprove; diff --git a/src/app/orders/orderApprovals/tests/orderApprovals.spec.js b/src/app/orders/orderApprovals/tests/orderApprovals.spec.js new file mode 100644 index 00000000..6bfbe6cd --- /dev/null +++ b/src/app/orders/orderApprovals/tests/orderApprovals.spec.js @@ -0,0 +1,177 @@ +describe('Component: orderApprovals', function() { + var scope, + q, + oc, + _ocApprovals, + mockOrderID, + mockBuyerID, + mockCurrentUser, + stateParams + ; + beforeEach(module(function($provide) { + mockCurrentUser = {FirstName: 'JohnSmith', ID: 'JohnSmith123'}; + mockOrderID = 'OrderID123'; + mockBuyerID = 'Buyer123'; + stateParams = {buyerid: mockBuyerID, orderid: mockOrderID}; + $provide.value('CurrentUser', mockCurrentUser); + })); + beforeEach(module('orderCloud')); + beforeEach(module('orderCloud.sdk')); + beforeEach(inject(function($q, $rootScope, OrderCloud, ocParameters, ocApprovals) { + q = $q; + scope = $rootScope.$new(); + oc = OrderCloud; + _ocApprovals = ocApprovals; + })); + + + + describe('State: orderDetail.approvals', function() { + var state + ; + beforeEach(inject(function($state, $stateParams) { + $stateParams.orderid = stateParams.orderid; + $stateParams.buyerid = stateParams.buyerid; + state = $state.get('orderDetail.approvals'); + + var mockUserList = {Meta: 'mockMeta', Items: [{Username: 'test1', ID: 1}, {Username: 'test2', ID: 2}]}; + var defer = q.defer(); + defer.resolve(mockUserList); + + spyOn(_ocApprovals, 'List'); + spyOn(oc.Orders, 'ListEligibleApprovers').and.returnValue(defer.promise); + })); + it('should resolve OrderApprovals', inject(function($injector){ + $injector.invoke(state.resolve.OrderApprovals); + expect(_ocApprovals.List).toHaveBeenCalledWith(mockOrderID, mockBuyerID, 1, 100); + })); + it('should resolve CanApprove', inject(function($injector) { + $injector.invoke(state.resolve.CanApprove); + expect(oc.Orders.ListEligibleApprovers).toHaveBeenCalledWith(mockOrderID, null, 1, 100); + })); + }); + + + + describe('Controller: OrderApprovalsCtrl', function(){ + var orderApprovalsCtrl, + mockMeta, + mockResponse + ; + beforeEach(inject(function($controller, $stateParams){ + $stateParams = stateParams; + mockMeta = {Page: 2, PageSize: 15}; + mockResponse = {Items: [{ApprovalRuleID: 'Approval2', Status: 'Declined'}, {ApprovalRuleID: 'Approval3', Status: 'Pending'}], Meta: mockMeta}; + + orderApprovalsCtrl = $controller('OrderApprovalsCtrl', { + $stateParams: $stateParams, + OrderCloud: oc, + ocApprovals: _ocApprovals, + OrderApprovals: {Meta: {Page: 1, PageSize: 12}, Items: [{ApprovalRuleID: 'Approval1', Status: 'Approved'}] }, + CanApprove: true + }); + + var defer = q.defer(); + defer.resolve(mockResponse); + spyOn(_ocApprovals, 'List').and.returnValue(defer.promise); + spyOn(_ocApprovals, 'UpdateApprovalStatus'); + })); + + + describe('pageChanged', function(){ + it('should update results with page from vm.list.Meta.Page', function(){ + var mockPage = 3; + orderApprovalsCtrl.list.Meta.Page = mockPage; + orderApprovalsCtrl.pageChanged(); + expect(_ocApprovals.List).toHaveBeenCalledWith(mockOrderID, mockBuyerID, mockPage, 12); + scope.$digest(); + expect(orderApprovalsCtrl.list).toEqual(mockResponse); + }); + }); + + + describe('loadMore', function(){ + it('should concatenate next page of results with current list items', function(){ + var nextPage = orderApprovalsCtrl.list.Meta.Page + 1; + orderApprovalsCtrl.loadMore(); + expect(_ocApprovals.List).toHaveBeenCalledWith(mockOrderID, mockBuyerID, nextPage, 12); + scope.$digest(); + expect(orderApprovalsCtrl.list.Meta.Page).toBe(nextPage); + expect(orderApprovalsCtrl.list.Items).toEqual([{ApprovalRuleID: 'Approval1', Status: 'Approved'}, {ApprovalRuleID: 'Approval2', Status: 'Declined'}, {ApprovalRuleID: 'Approval3', Status: 'Pending'}]); + }); + }); + + + describe('updateApprovalStatus', function(){ + it('should call ocApprovals.UpdateApprovalStatus', function(){ + var intent = 'Approve'; + orderApprovalsCtrl.updateApprovalStatus(intent); + expect(_ocApprovals.UpdateApprovalStatus).toHaveBeenCalledWith(mockOrderID, intent); + }); + }); + }); + + + describe('Controller: OrderApprovalsCtrl', function(){ + var approvalModalCtrl, + exceptionHandler, + uibModal, + toaster + ; + beforeEach(inject(function($controller, $stateParams, $exceptionHandler, toastr){ + var intent = 'Approve'; + exceptionHandler = $exceptionHandler, + uibModal = jasmine.createSpyObj('modalInstance', ['close', 'dismiss', 'result.then']); + toaster = toastr; + + approvalModalCtrl = $controller('ApprovalModalCtrl', { + OrderID: mockOrderID, + Intent: intent, + $exceptionHandler: exceptionHandler, + $uibModalInstance: uibModal, + toastr: toaster + }); + + var defer = q.defer(); + defer.resolve(); + spyOn(toastr, 'success'); + spyOn(oc.Orders, 'Approve').and.returnValue(defer.promise); + spyOn(oc.Orders, 'Decline').and.returnValue(defer.promise); + })); + + + describe('cancel', function(){ + it('should dismiss modal', function(){ + approvalModalCtrl.cancel(); + expect(uibModal.dismiss).toHaveBeenCalled(); + }); + }); + + describe('submit', function(){ + it('should call OrderCloud.Orders.Submit if intent is set to "Submit"', function(){ + approvalModalCtrl.intent = 'Approve'; + approvalModalCtrl.submit(); + expect(oc.Orders.Approve).toHaveBeenCalledWith(mockOrderID, null); + }); + it('should call OrderCloud.Orders.Decline if intent is set to "Decline"', function(){ + approvalModalCtrl.intent = 'Decline'; + approvalModalCtrl.submit(); + expect(oc.Orders.Decline).toHaveBeenCalledWith(mockOrderID, null); + }); + it('should allow user to enter comments when approving', function(){ + var mockComments = 'Approval worked'; + approvalModalCtrl.intent = 'Approve'; + approvalModalCtrl.comments = mockComments; + approvalModalCtrl.submit(); + expect(oc.Orders.Approve).toHaveBeenCalledWith(mockOrderID, mockComments); + }); + it('should allow user to enter comments when declining', function(){ + var mockComments = 'Decline worked'; + approvalModalCtrl.intent = 'Decline'; + approvalModalCtrl.comments = mockComments; + approvalModalCtrl.submit(); + expect(oc.Orders.Decline).toHaveBeenCalledWith(mockOrderID, mockComments); + }); + }); + }); +}); \ No newline at end of file diff --git a/src/app/orders/orderDetails/tests/orderDetails.spec.js b/src/app/orders/orderDetails/tests/orderDetails.spec.js index 4b90496f..13094963 100644 --- a/src/app/orders/orderDetails/tests/orderDetails.spec.js +++ b/src/app/orders/orderDetails/tests/orderDetails.spec.js @@ -1,4 +1,4 @@ -fdescribe('Component: orders', function() { +describe('Component: orderDetails', function() { var scope, q, oc, @@ -51,7 +51,7 @@ fdescribe('Component: orders', function() { - describe('Controller: OrdersCtrl', function(){ + describe('Controller: OrderDetailsCtrl', function(){ var orderDetailsCtrl, mockMeta, mockResponse @@ -75,11 +75,13 @@ fdescribe('Component: orders', function() { describe('pageChanged', function(){ - it('should reload state with page from vm.lineItems.Meta.Page', function(){ + it('should update results with page from vm.lineItems.Meta.Page', function(){ var mockPage = 3; orderDetailsCtrl.lineItems.Meta.Page = mockPage; orderDetailsCtrl.pageChanged(); expect(oc.LineItems.List).toHaveBeenCalledWith(mockOrderID, null, mockPage, 12, null, null, null, mockBuyerID); + scope.$digest(); + expect(orderDetailsCtrl.lineItems).toEqual(mockResponse); }); }); @@ -95,5 +97,4 @@ fdescribe('Component: orders', function() { }); }); }); -}); - +}); \ No newline at end of file From e55e46c328091dff7c2e6f744b0c3c50f8ecdb5a Mon Sep 17 00:00:00 2001 From: Zeeshan Dawood <zdawood@four51.com> Date: Mon, 20 Mar 2017 16:29:37 -0500 Subject: [PATCH 042/158] [OC-2058] update unit test clean code as result of unit test --- src/app/favoriteProducts/favoriteProducts.js | 81 +++++++++++-------- .../tests/favoriteProducts.spec.js | 20 +++-- 2 files changed, 61 insertions(+), 40 deletions(-) diff --git a/src/app/favoriteProducts/favoriteProducts.js b/src/app/favoriteProducts/favoriteProducts.js index 6306f3f8..96a2aabd 100644 --- a/src/app/favoriteProducts/favoriteProducts.js +++ b/src/app/favoriteProducts/favoriteProducts.js @@ -109,55 +109,66 @@ function FavoriteProductDirective(){ function FavoriteProductController($scope, OrderCloud, toastr){ var vm = this; - if($scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts){ - vm.hasFavorites = true; - } - else{ - if($scope.currentUser && $scope.currentUser.xp){ - $scope.currentUser.xp.FavoriteProducts = []; - }else{ - $scope.currentUser.xp ={}; - $scope.currentUser.xp.FavoriteProducts = []; - } - OrderCloud.Me.Patch( {xp:$scope.currentUser.xp}) - .then(function(){ - vm.hasFavorites = true; - }) - .catch(function(ex){ - console.log(ex); - }); - } + vm.checkHasFavorites = checkHasFavorites; + vm.toggleFavoriteProduct = toggleFavoriteProduct; + vm.addProduct = addProduct; + vm.removeProduct = removeProduct; + + vm.checkHasFavorites(); vm.isFavorited = vm.hasFavorites && $scope.currentUser.xp.FavoriteProducts.indexOf($scope.product.ID) > -1; - vm.toggleFavoriteProduct = function(){ + function toggleFavoriteProduct(){ if (vm.hasFavorites){ if (vm.isFavorited){ removeProduct(); } else { addProduct($scope.currentUser.xp.FavoriteProducts); } - } else { addProduct([]); } - function addProduct(existingList){ - existingList.push($scope.product.ID); - OrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) - .then(function(data){ - vm.hasFavorites = data.xp && data.xp.FavoriteProducts; - vm.isFavorited = true; - toastr.success($scope.product.Name + ' was added to your favorites'); - }); + } + + function checkHasFavorites(){ + if($scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts){ + vm.hasFavorites = true; } - function removeProduct(){ - var updatedList = _.without($scope.currentUser.xp.FavoriteProducts, $scope.product.ID); - OrderCloud.Me.Patch({xp: {FavoriteProducts: updatedList}}) + else{ + if($scope.currentUser && $scope.currentUser.xp){ + $scope.currentUser.xp.FavoriteProducts = []; + }else{ + $scope.currentUser.xp ={}; + $scope.currentUser.xp.FavoriteProducts = []; + } + OrderCloud.Me.Patch( {xp:$scope.currentUser.xp}) .then(function(){ - vm.isFavorited = false; - $scope.currentUser.xp.FavoriteProducts = updatedList; - toastr.success($scope.product.Name + ' was removed from your favorites'); + vm.hasFavorites = true; + }) + .catch(function(ex){ + console.log(ex); }); } - }; + } + + function addProduct(existingList){ + existingList.push($scope.product.ID); + OrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) + .then(function(data){ + vm.hasFavorites = data.xp && data.xp.FavoriteProducts; + vm.isFavorited = true; + toastr.success($scope.product.Name + ' was added to your favorites'); + }); + } + + function removeProduct(){ + var updatedList = _.without($scope.currentUser.xp.FavoriteProducts, $scope.product.ID); + OrderCloud.Me.Patch({xp: {FavoriteProducts: updatedList}}) + .then(function(){ + vm.isFavorited = false; + $scope.currentUser.xp.FavoriteProducts = updatedList; + toastr.success($scope.product.Name + ' was removed from your favorites'); + }); + } + } diff --git a/src/app/favoriteProducts/tests/favoriteProducts.spec.js b/src/app/favoriteProducts/tests/favoriteProducts.spec.js index ad06db3b..631d6490 100644 --- a/src/app/favoriteProducts/tests/favoriteProducts.spec.js +++ b/src/app/favoriteProducts/tests/favoriteProducts.spec.js @@ -62,16 +62,26 @@ describe('Component: FavoriteProducts', function(){ OrderCloud: oc, toastr: toaster }); - + var defer = q.defer(); + defer.resolve(); + spyOn(oc.Me, 'Patch').and.returnValue(defer.promise); })); + + describe('checkHasFavorites', function(){ + it('should call the Me Patch when no favoriteProducts xp', function(){ + scope.currentUser = {}; + favoriteProductCtrl.checkHasFavorites(); + expect(oc.Me.Patch).toHaveBeenCalledWith({xp: {FavoriteProducts: []}}); + + }); + }); + describe('toggleFavoriteProduct', function(){ beforeEach(function(){ - var defer = q.defer(); - defer.resolve(); - spyOn(oc.Me, 'Patch').and.returnValue(defer.promise); spyOn(_, 'without').and.returnValue('updatedList'); spyOn(toaster, 'success'); }); + it('should call the Me Patch method when deleting a product', function(){ var updatedList = 'updatedList'; favoriteProductCtrl.hasFavorites = true; @@ -80,7 +90,7 @@ describe('Component: FavoriteProducts', function(){ expect(_.without).toHaveBeenCalled(); expect(oc.Me.Patch).toHaveBeenCalledWith({xp: {FavoriteProducts: updatedList}}); }); - it('should call the Me Patch method when removing a product', function(){ + it('should call the Me Patch method when adding a product', function(){ var existingList = ['favoriteProduct', 'productID']; favoriteProductCtrl.hasFavorites = true; favoriteProductCtrl.isFavorited = false; From a7418433258766fa676a385af3b8c5c97e336838 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Tue, 21 Mar 2017 08:48:11 -0500 Subject: [PATCH 043/158] workaround for spending account bug - EX-1053 When a payment with a type spending account is deleted the amount on that spending account gets added to the spending account. This workaround first patches the payment to type purchase order and then deletes it. Revert this back to just deleting the payment once the api bug has been resolved Resolve: OC-2084 --- .../payment/directives/payment.directives.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/checkout/payment/directives/payment.directives.js b/src/app/checkout/payment/directives/payment.directives.js index aac75bcf..41d5cd0e 100644 --- a/src/app/checkout/payment/directives/payment.directives.js +++ b/src/app/checkout/payment/directives/payment.directives.js @@ -333,11 +333,15 @@ function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, Order }; $scope.removePayment = function(scope) { - OrderCloud.Payments.Delete($scope.order.ID, scope.payment.ID) + // TODO: when api bug EX-1053 is fixed refactor this to simply delete the payment + return OrderCloud.Payments.Patch($scope.order.ID, scope.payment.ID, {Type: 'PurchaseOrder', SpendingAccountID: null}) .then(function() { - $scope.payments.Items.splice(scope.$index, 1); - calculateMaxTotal(); - toastr.success('Payment Removed'); + return OrderCloud.Payments.Delete($scope.order.ID, scope.payment.ID) + .then(function(){ + $scope.payments.Items.splice(scope.$index, 1); + calculateMaxTotal(); + return toastr.success('Payment Removed'); + }); }); }; From d0d4e7be91aeeb4bf8fbf36c1041b74baa47ce81 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Tue, 28 Mar 2017 13:02:56 -0500 Subject: [PATCH 044/158] =?UTF-8?q?Rob=20brought=20these=20styles=20over?= =?UTF-8?q?=20from=20admin=20but=20they=20don=E2=80=99t=20work=20well=20wi?= =?UTF-8?q?th=20buyer=20layout.=20we=20deleted=20when=20pair=20programming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/styles/global/_scaffolding.less | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/styles/global/_scaffolding.less b/src/app/styles/global/_scaffolding.less index 3ce21537..0a31833c 100644 --- a/src/app/styles/global/_scaffolding.less +++ b/src/app/styles/global/_scaffolding.less @@ -1,13 +1,5 @@ -html { - width:100vw; - height:100vh; - overflow:hidden; -} - body { - height:100%; overflow-x:hidden; - overflow-y:auto; padding-top:@body-padding-top; } From e4d844a9fc7b6ee146e2df41df3ee8fff0e9e2d3 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Tue, 28 Mar 2017 13:03:08 -0500 Subject: [PATCH 045/158] add buttons to clear date filters --- src/app/orders/orderList/js/orders.controller.js | 15 +++++++++++++++ src/app/orders/orderList/templates/orders.html | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/app/orders/orderList/js/orders.controller.js b/src/app/orders/orderList/js/orders.controller.js index 856fa756..7be9d9a7 100644 --- a/src/app/orders/orderList/js/orders.controller.js +++ b/src/app/orders/orderList/js/orders.controller.js @@ -26,6 +26,9 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o Filter / Search / Sort / Pagination functions */ vm.filter = filter; //Reload the state with new parameters + vm.today = Date.now(); + vm.clearFrom = clearFrom; //clears from parameters and resets page + vm.clearTo = clearTo; //clears to parameter and resets page vm.search = search; //Reload the state with new search parameter & reset the vm.clearSearch = clearSearch; //Clear the search parameter, reload the state & reset the page vm.updateSort = updateSort; //Conditionally set, reverse, remove the sortBy parameter & reload the state @@ -55,6 +58,18 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o $state.go('.', ocParameters.Create(vm.parameters, resetPage)); } + function clearFrom(){ + vm.parameters.from = null; + vm.fromDate = null; + vm.filter(true); + } + + function clearTo(){ + vm.parameters.to = null; + vm.toDate = null; + vm.filter(true); + } + function formatDate(){ //formats date as string to display in url if(vm.fromDate) vm.parameters.from = $filter('date')(angular.copy(vm.fromDate), 'MM-dd-yyyy'); diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/orders/orderList/templates/orders.html index f445b70a..4f1b9ca5 100644 --- a/src/app/orders/orderList/templates/orders.html +++ b/src/app/orders/orderList/templates/orders.html @@ -39,12 +39,22 @@ <h3 class="l-page-header__title"> <div class="col-sm-3 form-group"> <label for="FromDate">From Date</label> <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.fromDate" ng-blur="orders.filter(true)"> - <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> + <div class="input-group" ng-if="!application.isTouchDevice"> + <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> + <span class="input-group-btn" ng-if="orders.fromDate"> + <button class="btn btn-default" ng-click="orders.clearFrom()" type="button"><i class="fa fa-times text-danger"></i></button> + </span> + </div> </div> <div class="col-sm-3 form-group"> <label for="ToDate">To Date</label> <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.toDate" ng-blur="orders.filter(true)"> - <input id="ToDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.fromDate}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> + <div class="input-group" ng-if="!application.isTouchDevice"> + <input id="ToDate" type="text" class="form-control" ng-model="orders.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.fromDate, maxDate: orders.today}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> + <span class="input-group-btn" ng-if="orders.toDate"> + <button class="btn btn-default" ng-click="orders.clearTo()" type="button"><i class="fa fa-times text-danger"></i></button> + </span> + </div> </div> </div> </form> From d6f527cbfa238bef044f685c27c7bc842729e71e Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Thu, 30 Mar 2017 17:07:22 -0500 Subject: [PATCH 046/158] Replace custom nav with default bootstrap nav * Replace custom nav elements with default bootstrap nav * Use jasny-bootstrap navmenu on smaller viewports * Add class for hiding certain nav elements on smaller viewports OC-2054 --- src/app/base/templates/base.tpl.html | 94 ++++++++++++++++++++- src/app/base/templates/navigation.tpl.html | 95 ++++++++++++---------- src/app/styles/shame.less | 25 ++++++ 3 files changed, 169 insertions(+), 45 deletions(-) diff --git a/src/app/base/templates/base.tpl.html b/src/app/base/templates/base.tpl.html index 59ac2b89..afa3914a 100644 --- a/src/app/base/templates/base.tpl.html +++ b/src/app/base/templates/base.tpl.html @@ -1,4 +1,94 @@ -<header class="c-header c-header--fixed-top"> - <nav ui-view="nav"></nav> +<!--<header> + <div ui-view="nav"></div> +</header>--> +<nav class="navmenu navmenu-default navmenu-fixed-left offcanvas"> + <a class="navmenu-brand" ui-sref="home">{{application.name}}</a> + <ul class="nav navmenu-nav"> + <li> + <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span>Product Browse</span></a> + </li> + <li> + <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> + </li> + <li> + <a ui-sref="account"><i class="fa fa-user"></i> <span>Account</span></a> + </li> + <li class="divider"></li> + <li ui-sref-active="active"> + <a ui-sref="myAddresses">Personal Addresses</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="myPayments">Payment Methods</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="favoriteProducts">Favorite Products</a> + </li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a ui-sref="orders">Orders</a> + </li> + <li> + <a ng-click="application.logout()">Log out</a> + </li> + </ul> +</nav> +<header> + <nav class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="offcanvas" data-target=".navmenu" data-canvas="body"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" ui-sref="home">{{application.name}}</a> + </div> + <ul class="nav navbar-nav c-desktop-nav"> + <li> + <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span>Product Browse</span></a> + </li> + <li> + <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> + </li> + </ul> + <form class="navbar-form navbar-left c-desktop-nav"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Search"> + </div> + <button type="submit" class="btn btn-default">Submit</button> + </form> + <ul class="nav navbar-nav navbar-right"> + <li> + <a ui-sref="cart"><i class="fa fa-shopping-cart"></i> <span class="sr-only">Shopping Cart</span> <span class="badge" ng-bind="base.currentOrder.LineItemCount"></span></a> + </li> + </ul> + <ul class="nav navbar-nav navbar-right c-desktop-nav"> + <li class="c-desktop-nav" uib-dropdown ng-if="!base.currentUser.Anonymous"> + <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></span></a> + <ul class="dropdown-menu-right" uib-dropdown-menu> + <li> + <a ui-sref="account">My Account</a> + </li> + <li class="divider"></li> + <li ui-sref-active="active"> + <a ui-sref="myAddresses">Personal Addresses</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="myPayments">Payment Methods</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="favoriteProducts">Favorite Products</a> + </li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a ui-sref="orders">Orders</a> + </li> + <li class="divider"></li> + <li> + <a ng-click="application.logout()">Log out</a> + </li> + </ul> + </li> + </ul> + </div> + </nav> </header> <main ui-view class="container" cg-busy="application.stateLoading('base')"></main> \ No newline at end of file diff --git a/src/app/base/templates/navigation.tpl.html b/src/app/base/templates/navigation.tpl.html index 35a0689b..75ed4923 100644 --- a/src/app/base/templates/navigation.tpl.html +++ b/src/app/base/templates/navigation.tpl.html @@ -1,45 +1,54 @@ -<div class="container"> - <div class="c-topnav"> - <div class="c-topnav__group--left"> - <!--BRAND--> - <div class="c-topnav__item c-topnav__brand"> - <a ui-sref="home"> - {{application.name}} - </a> - </div> - <!--PRODUCT / CATEGORY BROWSE--> - <div class="c-topnav__item c-topnav__browse"> - <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span class="hidden-xs hidden-sm">Product Browse</span></a> - </div> - <div class="c-topnav__item c-topnav__browse"> - <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span class="hidden-xs hidden-sm">Category Browse</span></a> - </div> - <!--MOBILE PRODUCT SEARCH--> - <div class="c-topnav__item c-topnav__search hidden-lg hidden-md"> - <a href="" ng-click="base.mobileSearch()"><i class="fa fa-search"></i></a> - </div> - </div> - <!--DESKTOP PRODUCT SEARCH--> - <ordercloud-product-search class="c-topnav__item c-topnav__search hidden-xs hidden-sm"></ordercloud-product-search> - <div class="c-topnav__group--right"> - <!--CART--> - <div class="c-topnav__item c-topnav__cart"> - <a ui-sref="cart"><i class="fa fa-shopping-cart c-topnav__cart-icon"></i> <span class="sr-only">Shopping Cart</span> <span class="badge c-topnav__cart-count" ng-bind="base.currentOrder.LineItemCount"></span></a> - </div> - <!--ACCOUNT--> - <div class="c-topnav__item c-topnav__account" uib-dropdown ng-if="!base.currentUser.Anonymous"> - <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span class="hidden-xs hidden-sm">Account</span> <span class="caret hidden-xs"></span></a> - <ul class="dropdown-menu-right" uib-dropdown-menu> - <li><a ui-sref="account">My Account</a></li> - <li class="divider"></li> - <li ui-sref-active="active"><a ui-sref="myAddresses">Personal Addresses</a></li> - <li ui-sref-active="active"><a ui-sref="myPayments">Payment Methods</a></li> - <li ui-sref-active="active"><a ui-sref="favoriteProducts">Favorite Products</a></li> - <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"><a ui-sref="orders">Orders</a></li> - <li class="divider"></li> - <li><a ng-click="application.logout()">Log out</a></li> - </ul> - </div> +<nav class="navbar navbar-default navbar-fixed-top"> + <div class="container"> + <div class="navbar-header"> + <a class="navbar-brand" ui-sref="home">{{application.name}}</a> + <!-- Collect the nav links, forms, and other content for toggling --> </div> + <div> + <ul class="nav navbar-nav"> + <li> + <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span>Product Browse</span></a> + </li> + <li> + <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> + </li> + </ul> + <form class="navbar-form navbar-left"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Search"> + </div> + <button type="submit" class="btn btn-default">Submit</button> + </form> + <ul class="nav navbar-nav navbar-right"> + <li uib-dropdown ng-if="!base.currentUser.Anonymous"> + <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></span></a> + <ul class="dropdown-menu-right" uib-dropdown-menu> + <li> + <a ui-sref="account">My Account</a> + </li> + <li class="divider"></li> + <li ui-sref-active="active"> + <a ui-sref="myAddresses">Personal Addresses</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="myPayments">Payment Methods</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="favoriteProducts">Favorite Products</a> + </li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a ui-sref="orders">Orders</a> + </li> + <li class="divider"></li> + <li> + <a ng-click="application.logout()">Log out</a> + </li> + </ul> + </li> + <li> + <a ui-sref="cart"><i class="fa fa-shopping-cart"></i> <span class="sr-only">Shopping Cart</span> <span class="badge" ng-bind="base.currentOrder.LineItemCount"></span></a> + </li> + </ul> + </div><!-- /.navbar-collapse --> </div> -</div> +</nav> \ No newline at end of file diff --git a/src/app/styles/shame.less b/src/app/styles/shame.less index cdf9ac28..ca3af97d 100644 --- a/src/app/styles/shame.less +++ b/src/app/styles/shame.less @@ -41,4 +41,29 @@ li a, .panel-body; color:@text-muted; text-align:center; +} + +// Overriding default bootstrap behavior +.navbar-header, +.navbar-nav > li { + float: left; +} +.navbar-left { + float: left; + float: left !important; +} +.navbar-right { + float: right; + float: right !important; + margin-right: -15px; +} +.navbar-toggle { + float: left; + margin-left: @navbar-padding-horizontal; +} +// Hiding certain nav elements on smaller viewports +.c-desktop-nav { + @media (max-width: @grid-float-breakpoint-max) { + display: none; + } } \ No newline at end of file From c13476434d11a24a9f98166cb44c8226c90c34cc Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 08:49:13 -0500 Subject: [PATCH 047/158] Staging environment prep and configuration --- bower.json | 3 +- src/app/app.constants.json | 8 +- .../common/services/oc-wrapper/oc-wrapper.js | 79 +++++++++++++++++++ 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 src/app/common/services/oc-wrapper/oc-wrapper.js diff --git a/bower.json b/bower.json index 34437127..d3c56f87 100644 --- a/bower.json +++ b/bower.json @@ -44,7 +44,8 @@ "angular-busy2": "^5.2.0", "jasny-bootstrap": "3.1.3", "angular-payments": "*", - "bootswatch": "^3.3.7" + "bootswatch": "^3.3.7", + "ordercloud-javascript-sdk": "v1.0.43-staging-prerelease" }, "devDependencies": { "angular-mocks": "^1.6.0" diff --git a/src/app/app.constants.json b/src/app/app.constants.json index ec810625..126a2ee5 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,11 +1,11 @@ { "appname": "Angular Buyer", "scope": "MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin", - "clientid": "XXXXXXXX-XXXX-XXXX-XXXXXXXXXXXX", - "buyerid": "XXXX", + "clientid": "AEFFD7B0-C7A4-4E68-AB31-15B454964A7B", + "buyerid": "EXO-1E", "anonymous": false, - "catalogid": "XXXX", - "environment": "prod", + "catalogid": "EXO-1E", + "environment": "staging", "defaultstate": "home", "html5mode": false, "bootswatchtheme": null diff --git a/src/app/common/services/oc-wrapper/oc-wrapper.js b/src/app/common/services/oc-wrapper/oc-wrapper.js new file mode 100644 index 00000000..cef77866 --- /dev/null +++ b/src/app/common/services/oc-wrapper/oc-wrapper.js @@ -0,0 +1,79 @@ +angular.module('orderCloud') + //TODO: rename this to 'OrderCloud' once we finish refactoring to the new SDK + .factory('sdkOrderCloud', OrderCloudService) +; + +function OrderCloudService($cookies, $rootScope, $q, appname, apiurl, authurl) { + // get sdk from global variable + var sdk = {}; + var defaultClient = OrderCloudSDK.ApiClient.instance; + var oauth2 = defaultClient.authentications['oauth2']; + var cookieAppName = appname.replace(/ /g, '_').toLowerCase(); + var authTokenCookieName = cookieAppName + '.token'; + var impersonationTokenCookieName = cookieAppName + '.impersonation.token'; + var refreshTokenCookieName = cookieAppName + '.refresh.token'; + OrderCloudSDK.ApiClient.instance.baseApiPath = apiurl + '/v1'; + OrderCloudSDK.ApiClient.instance.baseAuthPath = authurl; + for(var method in OrderCloudSDK) { + if (OrderCloudSDK.hasOwnProperty(method)) { + sdk[method] = {}; + for (var apiCall in OrderCloudSDK[method]) { + if (OrderCloudSDK[method].hasOwnProperty(apiCall)) { + sdk[method][apiCall] = (function() { + var useMethod = method, + useApiCall = apiCall; + return function() { + var dfd = $q.defer(); + dfd.resolve(OrderCloudSDK[useMethod][useApiCall].apply(OrderCloudSDK[useMethod], arguments)); + return dfd.promise; + } + })(); + } + } + } + } + + var _getToken = function() { + var token = $cookies.get(authTokenCookieName); + oauth2.accessToken = token; + return token; + }; + + var _getImpersonationToken = function() { + var token = $cookies.get(impersonationTokenCookieName); + oauth2.impersonationToken = token; + return token; + }; + + var _getRefreshToken = function() { + var token = $cookies.get(refreshTokenCookieName); + return token; + } + + var _setToken = function(token) { + oauth2.accessToken = token; + $cookies.put(authTokenCookieName, token); + }; + + var _setImpersonationToken = function(token) { + oauth2.impersonationToken = token; + $cookies.put(impersonationTokenCookieName, token); + }; + + var _setRefreshToken = function(token) { + $cookies.put(refreshTokenCookieName, token); + } + + sdk.GetToken = _getToken; + sdk.GetImpersonationToken = _getImpersonationToken; + sdk.GetRefreshToken = _getRefreshToken; + sdk.SetToken = _setToken; + sdk.SetImpersonationToken = _setImpersonationToken; + sdk.SetRefreshToken = _setRefreshToken; + + //init authentication for page refresh + _getToken(); + _getImpersonationToken(); + + return sdk; +} \ No newline at end of file From 6ac41111a9f7752e5bacc9588b6387cb841e66fe Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 09:14:11 -0500 Subject: [PATCH 048/158] SDK Update: Login refactor and Config updates --- gulp.config.js | 8 +- src/app/app.constants.json | 2 +- src/app/base/base.js | 10 +- src/app/login/js/login.config.js | 14 +++ src/app/login/js/login.controller.js | 78 ++++++++++++ src/app/login/js/login.service.js | 90 ++++++++++++++ src/app/login/login.js | 157 ------------------------- src/app/login/templates/login.tpl.html | 21 ++++ 8 files changed, 216 insertions(+), 164 deletions(-) create mode 100644 src/app/login/js/login.config.js create mode 100644 src/app/login/js/login.controller.js create mode 100644 src/app/login/js/login.service.js delete mode 100644 src/app/login/login.js diff --git a/gulp.config.js b/gulp.config.js index 8e4f07af..f8d2787e 100644 --- a/gulp.config.js +++ b/gulp.config.js @@ -76,19 +76,19 @@ function getConstants() { var environment = process.env.environment || constants.environment; switch (environment) { case 'local': - result.authurl = 'http://core.four51.com:11629/oauth/token'; + result.authurl = 'http://core.four51.com:11629'; result.apiurl = 'http://core.four51.com:9002'; break; case 'qa': - result.authurl = 'https://qaauth.ordercloud.io/oauth/token'; + result.authurl = 'https://qaauth.ordercloud.io'; result.apiurl = 'https://qaapi.ordercloud.io'; break; case 'staging': - result.authurl = 'https://stagingauth.ordercloud.io/oauth/token'; + result.authurl = 'https://stagingauth.ordercloud.io'; result.apiurl = 'https://stagingapi.ordercloud.io'; break; default: - result.authurl = 'https://auth.ordercloud.io/oauth/token'; + result.authurl = 'https://auth.ordercloud.io'; result.apiurl = 'https://api.ordercloud.io'; break; } diff --git a/src/app/app.constants.json b/src/app/app.constants.json index 126a2ee5..29773f49 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,6 +1,6 @@ { "appname": "Angular Buyer", - "scope": "MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin", + "scope": ["MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper"], "clientid": "AEFFD7B0-C7A4-4E68-AB31-15B454964A7B", "buyerid": "EXO-1E", "anonymous": false, diff --git a/src/app/base/base.js b/src/app/base/base.js index 5e752877..05bfe8b5 100644 --- a/src/app/base/base.js +++ b/src/app/base/base.js @@ -26,8 +26,14 @@ function BaseConfig($stateProvider) { return data; }) }, - ExistingOrder: function($q, OrderCloud, CurrentUser) { - return OrderCloud.Me.ListOutgoingOrders(null, 1, 1, null, "!DateCreated", {Status:"Unsubmitted"}) + ExistingOrder: function($q, sdkOrderCloud, CurrentUser) { + var options = { + page: 1, + pageSize: 1, + sortBy: '!DateCreated', + filters: {Status: 'Unsubmitted'} + }; + return sdkOrderCloud.Me.ListOrders(options) .then(function(data) { return data.Items[0]; }); diff --git a/src/app/login/js/login.config.js b/src/app/login/js/login.config.js new file mode 100644 index 00000000..6cb8b849 --- /dev/null +++ b/src/app/login/js/login.config.js @@ -0,0 +1,14 @@ +angular.module('orderCloud') + .config(LoginConfig) +; + +function LoginConfig($stateProvider) { + $stateProvider + .state('login', { + url: '/login/:token', + templateUrl: 'login/templates/login.tpl.html', + controller: 'LoginCtrl', + controllerAs: 'login' + }) + ; +} \ No newline at end of file diff --git a/src/app/login/js/login.controller.js b/src/app/login/js/login.controller.js new file mode 100644 index 00000000..4b7c4372 --- /dev/null +++ b/src/app/login/js/login.controller.js @@ -0,0 +1,78 @@ +angular.module('orderCloud') + .controller('LoginCtrl', LoginController) +; + +function LoginController($state, $stateParams, $exceptionHandler, OrderCloud, sdkOrderCloud, LoginService, ocRolesService, buyerid, clientid, scope) { + var vm = this; + vm.credentials = { + Username: null, + Password: null + }; + vm.token = $stateParams.token; + vm.form = vm.token ? 'reset' : 'login'; + vm.setForm = function(form) { + vm.form = form; + }; + vm.rememberStatus = false; + + vm.submit = function() { + vm.loading = sdkOrderCloud.Auth.Login(vm.credentials.Username, vm.credentials.Password, clientid, scope) + .then(function(data) { + sdkOrderCloud.SetToken(data.access_token); + OrderCloud.Auth.SetToken(data.access_token); //TODO: remove this line after refactor is complete + if (vm.rememberStatus) sdkOrderCloud.SetRefreshToken(data['refresh_token']); + var roles = ocRolesService.Set(data.access_token); + if (roles.length == 1 && roles[0] == 'PasswordReset') { + vm.token = data.access_token; + vm.form = 'resetByToken'; + } else { + $state.go('home'); + } + }) + .catch(function(ex) { + $exceptionHandler(ex); + }); + }; + + vm.forgotPassword = function() { + vm.loading = LoginService.SendVerificationCode(vm.credentials.Email) + .then(function() { + vm.setForm('verificationCodeSuccess'); + vm.credentials.Email = null; + }) + .catch(function(ex) { + $exceptionHandler(ex); + }); + }; + + vm.resetPasswordByToken = function() { + vm.loading = sdkOrderCloud.Me.ResetPasswordByToken({NewPassword:vm.credentials.NewPassword}) + .then(function(data) { + vm.setForm('resetSuccess'); + vm.credentials = { + Username:null, + Password:null + } + }) + .catch(function(ex) { + $exceptionHandler(ex); + }) + }; + + vm.resetPassword = function() { + vm.loading = LoginService.ResetPassword(vm.credentials, vm.token) + .then(function() { + vm.setForm('resetSuccess'); + vm.token = null; + vm.credentials.ResetUsername = null; + vm.credentials.NewPassword = null; + vm.credentials.ConfirmPassword = null; + }) + .catch(function(ex) { + $exceptionHandler(ex); + vm.credentials.ResetUsername = null; + vm.credentials.NewPassword = null; + vm.credentials.ConfirmPassword = null; + }); + }; +} \ No newline at end of file diff --git a/src/app/login/js/login.service.js b/src/app/login/js/login.service.js new file mode 100644 index 00000000..aa63527d --- /dev/null +++ b/src/app/login/js/login.service.js @@ -0,0 +1,90 @@ +angular.module('orderCloud') + .factory('LoginService', LoginService) +; + +function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrderCloud, ocRolesService, clientid, buyerid, anonymous, scope) { + return { + SendVerificationCode: _sendVerificationCode, + ResetPassword: _resetPassword, + RememberMe: _rememberMe, + AuthAnonymous: _authAnonymous, + Logout: _logout + }; + + function _sendVerificationCode(email) { + var deferred = $q.defer(); + + var passwordResetRequest = { + Email: email, + ClientID: clientid, + URL: encodeURIComponent($window.location.href) + '{0}' + }; + + sdkOrderCloud.PasswordResets.SendVerificationCode(passwordResetRequest) + .then(function() { + deferred.resolve(); + }) + .catch(function(ex) { + deferred.reject(ex); + }); + + return deferred.promise; + } + + function _resetPassword(resetPasswordCredentials, verificationCode) { + var deferred = $q.defer(); + + var passwordReset = { + ClientID: clientid, + Username: resetPasswordCredentials.ResetUsername, + Password: resetPasswordCredentials.NewPassword + }; + + sdkOrderCloud.PasswordResets.ResetPassword(verificationCode, passwordReset) + .then(function() { + deferred.resolve(); + }) + .catch(function(ex) { + deferred.reject(ex); + }); + + return deferred.promise; + } + + function _authAnonymous() { + return OrderCloud.Auth.GetToken('') + .then(function(data) { + OrderCloud.BuyerID.Set(buyerid); + OrderCloud.Auth.SetToken(data.access_token); + $state.go('home'); + }); + } + + function _logout() { + angular.forEach($cookies.getAll(), function(val, key) { + $cookies.remove(key); + }); + ocRolesService.Remove(); + $state.go(anonymous ? 'home' : 'login', {}, {reload: true}); + } + + function _rememberMe() { + var availableRefreshToken = sdkOrderCloud.GetRefreshToken() || null; + + if (availableRefreshToken) { + sdkOrderCloud.Auth.RefreshToken(availableRefreshToken, clientid, scope) + .then(function(data) { + sdkOrderCloud.Auth.SetToken(data.access_token); + OrderCloud.BuyerID.Set(buyerid); + OrderCloud.Auth.SetToken(data.access_token); + $state.go('home'); + }) + .catch(function () { + toastr.error('Your token has expired, please log in again.'); + _logout(); + }); + } else { + _logout(); + } + } +} \ No newline at end of file diff --git a/src/app/login/login.js b/src/app/login/login.js deleted file mode 100644 index b8fc055b..00000000 --- a/src/app/login/login.js +++ /dev/null @@ -1,157 +0,0 @@ -angular.module('orderCloud') - .config(LoginConfig) - .factory('LoginService', LoginService) - .controller('LoginCtrl', LoginController) -; - -function LoginConfig($stateProvider) { - $stateProvider - .state('login', { - url: '/login/:token', - templateUrl: 'login/templates/login.tpl.html', - controller: 'LoginCtrl', - controllerAs: 'login' - }) - ; -} - -function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, ocRolesService, clientid, buyerid, anonymous) { - return { - SendVerificationCode: _sendVerificationCode, - ResetPassword: _resetPassword, - RememberMe: _rememberMe, - AuthAnonymous: _authAnonymous, - Logout: _logout - }; - - function _sendVerificationCode(email) { - var deferred = $q.defer(); - - var passwordResetRequest = { - Email: email, - ClientID: clientid, - URL: encodeURIComponent($window.location.href) + '{0}' - }; - - OrderCloud.PasswordResets.SendVerificationCode(passwordResetRequest) - .then(function() { - deferred.resolve(); - }) - .catch(function(ex) { - deferred.reject(ex); - }); - - return deferred.promise; - } - - function _resetPassword(resetPasswordCredentials, verificationCode) { - var deferred = $q.defer(); - - var passwordReset = { - ClientID: clientid, - Username: resetPasswordCredentials.ResetUsername, - Password: resetPasswordCredentials.NewPassword - }; - - OrderCloud.PasswordResets.ResetPassword(verificationCode, passwordReset). - then(function() { - deferred.resolve(); - }) - .catch(function(ex) { - deferred.reject(ex); - }); - - return deferred.promise; - } - - function _authAnonymous() { - return OrderCloud.Auth.GetToken('') - .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); - OrderCloud.Auth.SetToken(data.access_token); - $state.go('home'); - }); - } - - function _logout() { - angular.forEach($cookies.getAll(), function(val, key) { - $cookies.remove(key); - }); - ocRolesService.Remove(); - $state.go(anonymous ? 'home' : 'login', {}, {reload: true}); - } - - function _rememberMe() { - var availableRefreshToken = OrderCloud.Refresh.ReadToken() || null; - - if (availableRefreshToken) { - OrderCloud.Refresh.GetToken(availableRefreshToken) - .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); - OrderCloud.Auth.SetToken(data.access_token); - $state.go('home'); - }) - .catch(function () { - toastr.error('Your token has expired, please log in again.'); - _logout(); - }); - } else { - _logout(); - } - } -} - -function LoginController($state, $stateParams, $exceptionHandler, OrderCloud, LoginService, buyerid) { - var vm = this; - vm.credentials = { - Username: null, - Password: null - }; - vm.token = $stateParams.token; - vm.form = vm.token ? 'reset' : 'login'; - vm.setForm = function(form) { - vm.form = form; - }; - vm.rememberStatus = false; - - vm.submit = function() { - vm.loading = OrderCloud.Auth.GetToken(vm.credentials) - .then(function(data) { - vm.rememberStatus ? OrderCloud.Refresh.SetToken(data['refresh_token']) : angular.noop(); - OrderCloud.BuyerID.Set(buyerid); - OrderCloud.Auth.SetToken(data['access_token']); - $state.go('home'); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - }; - - vm.forgotPassword = function() { - vm.loading = LoginService.SendVerificationCode(vm.credentials.Email) - .then(function() { - vm.setForm('verificationCodeSuccess'); - vm.credentials.Email = null; - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - }; - - vm.resetPassword = function() { - vm.loading = LoginService.ResetPassword(vm.credentials, vm.token) - .then(function() { - vm.setForm('resetSuccess'); - vm.token = null; - vm.credentials.ResetUsername = null; - vm.credentials.NewPassword = null; - vm.credentials.ConfirmPassword = null; - }) - .catch(function(ex) { - $exceptionHandler(ex); - vm.credentials.ResetUsername = null; - vm.credentials.NewPassword = null; - vm.credentials.ConfirmPassword = null; - }); - }; -} \ No newline at end of file diff --git a/src/app/login/templates/login.tpl.html b/src/app/login/templates/login.tpl.html index bbed304f..c321982b 100644 --- a/src/app/login/templates/login.tpl.html +++ b/src/app/login/templates/login.tpl.html @@ -70,6 +70,27 @@ <h3 class="text-center">Reset Password</h3> </div> </div> + <!--RESET PASSWORD BY TOKEN--> + <div ng-switch-when="resetByToken"> + <div class="panel panel-default"> + <form class="panel-body" name="ResetPasswordForm" ng-submit="login.resetPasswordByToken()" > + <h3 class="text-center">Reset Password</h3> + <div class="alert alert-info"> + Due to a change in how we store password information, <br>as of <b>TBD</b> you must reset your password. <br> You can use the same password as before. + </div> + <div class="form-group"> + <label for="NewPassword" class="sr-only">New Password</label> + <input type="password" class="form-control" id="NewPassword" name="NewPassword" placeholder="New Password" ng-model="login.credentials.NewPassword" ng-required="true" autofocus/> + </div> + <div class="form-group"> + <label for="ConfirmPassword" class="sr-only">Confirm Password</label> + <input type="password" class="form-control" id="ConfirmPassword" placeholder="Confirm New Password" ng-model="login.credentials.ConfirmPassword" ng-required="true" /> + </div> + <button type="submit" id="reset_submit" class="btn btn-primary btn-block" ng-disabled="ResetPasswordForm.$invalid || login.credentials.NewPassword != login.credentials.ConfirmPassword">Submit</button> + </form> + </div> + </div> + <div ng-switch-when="verificationCodeSuccess"> <div class="alert alert-success text-center" id="forgot_message">Forgot password email has been sent. <br> Please check your email in order to reset your password.</div> </div> From d6e3fec8fb736da765eefc7b67b9bc6925c07768 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 09:27:53 -0500 Subject: [PATCH 049/158] SDK Update: Base --- src/app/base/base.js | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/src/app/base/base.js b/src/app/base/base.js index 05bfe8b5..5067052f 100644 --- a/src/app/base/base.js +++ b/src/app/base/base.js @@ -19,10 +19,10 @@ function BaseConfig($stateProvider) { } }, resolve: { - CurrentUser: function($q, $state, OrderCloud, buyerid) { - return OrderCloud.Me.Get() + CurrentUser: function($q, $state, OrderCloud, sdkOrderCloud, buyerid) { + return sdkOrderCloud.Me.Get() .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); + OrderCloud.BuyerID.Set(buyerid); //TODO: remove this line after refactor is complete return data; }) }, @@ -45,14 +45,14 @@ function BaseConfig($stateProvider) { return ExistingOrder; } }, - AnonymousUser: function($q, OrderCloud, CurrentUser) { - CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(OrderCloud.Auth.ReadToken().split('.')[1])).orderid); + AnonymousUser: function($q, sdkOrderCloud, CurrentUser) { + CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(sdkOrderCloud.GetToken().split('.')[1])).orderid); } } }); } -function BaseController($rootScope, $state, ProductSearch, CurrentUser, CurrentOrder, OrderCloud) { +function BaseController($rootScope, $state, sdkOrderCloud, ProductSearch, CurrentUser, CurrentOrder) { var vm = this; vm.currentUser = CurrentUser; vm.currentOrder = CurrentOrder; @@ -72,14 +72,14 @@ function BaseController($rootScope, $state, ProductSearch, CurrentUser, CurrentO vm.orderLoading = { message: message }; - vm.orderLoading.promise = OrderCloud.Orders.Get(OrderID) + vm.orderLoading.promise = sdkOrderCloud.Orders.Get('outgoing', OrderID) .then(function(data) { vm.currentOrder = data; }); }); } -function NewOrderService($q, OrderCloud) { +function NewOrderService($q, sdkOrderCloud) { var service = { Create: _create }; @@ -89,7 +89,12 @@ function NewOrderService($q, OrderCloud) { var order = {}; //ShippingAddressID - OrderCloud.Me.ListAddresses(null, 1, 100, null, null, {Shipping: true}) + var options = { + page: 1, + pageSize: 100, + filters: {Shipping: true} + }; + sdkOrderCloud.Me.ListAddresses(options) .then(function(shippingAddresses) { if (shippingAddresses.Items.length) order.ShippingAddressID = shippingAddresses.Items[0].ID; setBillingAddress(); @@ -97,7 +102,12 @@ function NewOrderService($q, OrderCloud) { //BillingAddressID function setBillingAddress() { - OrderCloud.Me.ListAddresses(null, 1, 100, null, null, {Billing: true}) + var options = { + page: 1, + pageSize: 100, + filters: {Billing: true} + }; + sdkOrderCloud.Me.ListAddresses(options) .then(function(billingAddresses) { if (billingAddresses.Items.length) order.BillingAddressID = billingAddresses.Items[0].ID; createOrder(); @@ -105,7 +115,7 @@ function NewOrderService($q, OrderCloud) { } function createOrder() { - OrderCloud.Orders.Create(order) + sdkOrderCloud.Orders.Create('outgoing', order) .then(function(order) { deferred.resolve(order); }); From 7f5eed81fba5bf9b584c30d5d5851676780024f7 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 10:14:00 -0500 Subject: [PATCH 050/158] OC-2044 Refactor account settings page to match angular-admin app --- src/app/account/account.js | 212 ------------------ src/app/account/js/account.config.js | 18 ++ src/app/account/js/account.controller.js | 52 +++++ src/app/account/js/account.service.js | 51 +++++ .../js/changePassword.modal.controller.js | 31 +++ .../js/confirmPassword.modal.controller.js | 32 +++ src/app/account/templates/account.tpl.html | 47 ++-- ...al.tpl.html => accountSettings.modal.html} | 0 ...dal.tpl.html => changePassword.modal.html} | 20 +- .../templates/confirmPassword.modal.html | 16 ++ .../templates/confirmPassword.modal.tpl.html | 15 -- src/app/app.constants.json | 2 +- 12 files changed, 244 insertions(+), 252 deletions(-) delete mode 100644 src/app/account/account.js create mode 100644 src/app/account/js/account.config.js create mode 100644 src/app/account/js/account.controller.js create mode 100644 src/app/account/js/account.service.js create mode 100644 src/app/account/js/changePassword.modal.controller.js create mode 100644 src/app/account/js/confirmPassword.modal.controller.js rename src/app/account/templates/{accountSettings.modal.tpl.html => accountSettings.modal.html} (100%) rename src/app/account/templates/{changePassword.modal.tpl.html => changePassword.modal.html} (54%) create mode 100644 src/app/account/templates/confirmPassword.modal.html delete mode 100644 src/app/account/templates/confirmPassword.modal.tpl.html diff --git a/src/app/account/account.js b/src/app/account/account.js deleted file mode 100644 index eb3e7c6f..00000000 --- a/src/app/account/account.js +++ /dev/null @@ -1,212 +0,0 @@ -angular.module('orderCloud') - .config(AccountConfig) - .controller('AccountInfoCtrl', AccountInfoController) - .controller('AccountEditModalCtrl', AccountEditModalController) - .factory('AccountService', AccountService) - .controller('ChangePasswordModalCtrl', ChangePasswordModalController) - .controller('ConfirmPasswordCtrl', ConfirmPasswordController) -; - -function AccountConfig($stateProvider) { - $stateProvider - .state('account', { - parent: 'base', - url: '/account', - templateUrl: 'account/templates/account.tpl.html', - controller: 'AccountInfoCtrl', - controllerAs: 'accountInfo', - data: { - pageTitle: "Account" - } - }) - ; -} - -function AccountService($q, $uibModal, OrderCloud, toastr) { - var service = { - Update: _update, - ChangePassword: _changePassword - }; - - function _update(currentProfile, newProfile) { - var deferred = $q.defer(); - - function updateUser() { - OrderCloud.Me.Update(newProfile) - .then(function(data) { - deferred.resolve(data); - }) - .catch(function(ex) { - deferred.reject(ex); - }); - } - - $uibModal.open({ - animation: true, - templateUrl: 'account/templates/confirmPassword.modal.tpl.html', - controller: 'ConfirmPasswordCtrl', - controllerAs: 'confirmPassword', - size: 'md' - }).result.then(function(password) { - var checkPasswordCredentials = { - Username: currentProfile.Username, - Password: password - }; - - OrderCloud.Auth.GetToken(checkPasswordCredentials) - .then(function() { - updateUser(); - toastr.success('Account changes were saved.', 'Success!'); - }) - .catch(function(ex) { - deferred.reject(ex); - }); - }, function() { - angular.noop(); - }); - - return deferred.promise; - } - - function _changePassword(currentUser) { - var deferred = $q.defer(); - - var checkPasswordCredentials = { - Username: currentUser.Username, - Password: currentUser.CurrentPassword - }; - - function changePassword() { - currentUser.Password = currentUser.NewPassword; - OrderCloud.Me.Update(currentUser) - .then(function() { - deferred.resolve(); - }); - } - - OrderCloud.Auth.GetToken(checkPasswordCredentials) - .then(function() { - changePassword(); - }) - .catch(function(ex) { - deferred.reject(ex); - }); - - return deferred.promise; - } - - return service; -} - -function AccountInfoController($uibModal, CurrentUser){ - var vm = this; - vm.profile = angular.copy(CurrentUser); - vm.currentUser = CurrentUser; - - vm.editInfo = function(){ - $uibModal.open({ - animation: true, - templateUrl: 'account/templates/accountSettings.modal.tpl.html', - controller: 'AccountEditModalCtrl', - controllerAs: 'accountEditModal', - backdrop:'static', - size: 'md', - resolve: { - Profile: function(){ - return vm.profile; - }, - CurrentUser: function(){ - return vm.currentUser; - } - } - }); - }; - - vm.changePassword = function(user){ - $uibModal.open({ - animation: true, - templateUrl: 'account/templates/changePassword.modal.tpl.html', - controller: 'ChangePasswordModalCtrl', - controllerAs: 'changePasswordModal', - backdrop:'static', - size: 'md', - resolve: { - CurrentUser: function(){ - return user; - } - } - }); - }; -} - -function AccountEditModalController($uibModalInstance, $exceptionHandler, AccountService, CurrentUser, Profile){ - var vm = this; - vm.profile = Profile; - var currentProfile = CurrentUser; - - vm.update = function() { - AccountService.Update(currentProfile, vm.profile) - .then(function(data) { - vm.profile = angular.copy(data); - currentProfile = data; - vm.submit(); - }) - .catch(function(ex) { - vm.profile = currentProfile; - $exceptionHandler(ex); - }); - }; - - vm.resetForm = function(form) { - vm.profile = currentProfile; - form.$setPristine(true); - }; - - vm.submit = function() { - $uibModalInstance.close(); - }; - - vm.cancel = function() { - $uibModalInstance.dismiss('cancel'); - }; -} - -function ChangePasswordModalController(toastr, $state, $exceptionHandler, AccountService, $uibModalInstance, CurrentUser){ - var vm = this; - vm.currentUser = CurrentUser; - - vm.changePassword = function() { - AccountService.ChangePassword(vm.currentUser) - .then(function() { - toastr.success('Password successfully changed', 'Success!'); - vm.currentUser.CurrentPassword = null; - vm.currentUser.NewPassword = null; - vm.currentUser.ConfirmPassword = null; - vm.submit(); - $state.go('account.information'); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - }; - - vm.submit = function() { - $uibModalInstance.close(); - }; - - vm.cancel = function() { - $uibModalInstance.dismiss('cancel'); - }; -} - -function ConfirmPasswordController($uibModalInstance) { - var vm = this; - - vm.submit = function() { - $uibModalInstance.close(vm.password); - }; - - vm.cancel = function() { - $uibModalInstance.dismiss('cancel'); - }; -} \ No newline at end of file diff --git a/src/app/account/js/account.config.js b/src/app/account/js/account.config.js new file mode 100644 index 00000000..a2ce4df1 --- /dev/null +++ b/src/app/account/js/account.config.js @@ -0,0 +1,18 @@ +angular.module('orderCloud') + .config(AccountConfig) +; + +function AccountConfig($stateProvider) { + $stateProvider + .state('account', { + parent: 'base', + url: '/account', + templateUrl: 'account/templates/account.tpl.html', + controller: 'AccountCtrl', + controllerAs: 'account', + data: { + pageTitle: "Account" + } + }) + ; +} \ No newline at end of file diff --git a/src/app/account/js/account.controller.js b/src/app/account/js/account.controller.js new file mode 100644 index 00000000..21796020 --- /dev/null +++ b/src/app/account/js/account.controller.js @@ -0,0 +1,52 @@ +angular.module('orderCloud') + .controller('AccountCtrl', AccountController) +; + +function AccountController($exceptionHandler, $uibModal, toastr, sdkOrderCloud, ocAccount, CurrentUser){ + var vm = this; + vm.profile = angular.copy(CurrentUser); + vm.currentUser = CurrentUser; + + vm.usernameChange = function () { + vm.settingsForm.Username.$setValidity('User.UsernameMustBeUnique', true); + }; + + vm.updateProfile = function () { + ocAccount.ConfirmPassword(vm.currentUser) + .then(function () { + vm.profileUpdateLoading = sdkOrderCloud.Me.Patch(_.pick(vm.profile, ['FirstName', 'LastName', 'Email', 'Phone'])) + .then(function (updatedUser) { + vm.profile = angular.copy(updatedUser); + vm.currentUser = updatedUser; + vm.profileForm.$setPristine(); + toastr.success('Your profile information was updated.'); + }); + }); + }; + + vm.updateUsername = function () { + ocAccount.ConfirmPassword(vm.currentUser) + .then(function () { + vm.profileUpdateLoading = sdkOrderCloud.Me.Patch(_.pick(vm.profile, 'Username')) + .then(function (updatedUser) { + vm.profile = angular.copy(updatedUser); + vm.currentUser = updatedUser; + vm.settingsForm.$setPristine(); + toastr.success('Your username was updated.'); + }) + .catch(function (ex) { + if (ex.status === 409) { + vm.settingsForm.Username.$setValidity(ex.data.Errors[0].ErrorCode, false); + } + $exceptionHandler(ex); + }); + }); + }; + + vm.changePassword = function () { + ocAccount.ChangePassword(vm.currentUser) + .then(function () { + toastr.success('Your password was successfully changed. Next time you log in you will have to use your new password.'); + }); + }; +} \ No newline at end of file diff --git a/src/app/account/js/account.service.js b/src/app/account/js/account.service.js new file mode 100644 index 00000000..fa1cb236 --- /dev/null +++ b/src/app/account/js/account.service.js @@ -0,0 +1,51 @@ +angular.module('orderCloud') + .factory('ocAccount', OrderCloudAccountService) +; + +function OrderCloudAccountService($q, $uibModal, $cookies, appname) { + var service = { + ConfirmPassword: _confirmPassword, + ChangePassword: _changePassword + }; + + function _confirmPassword(currentUser) { + var hasConfirmed = $cookies.get('oc_has_confirmed.' + appname); + if (hasConfirmed) { + var df = $q.defer(); + df.resolve(); + return df.promise; + } else { + return $uibModal.open({ + animation: true, + templateUrl: 'account/templates/confirmPassword.modal.html', + controller: 'ConfirmPasswordModalCtrl', + controllerAs: 'confirmPasswordModal', + size: 'confirm', + resolve: { + CurrentUser: function () { + return currentUser; + } + } + }).result; + } + } + + function _changePassword(currentUser) { + return $uibModal.open({ + animation: true, + templateUrl: 'account/templates/changePassword.modal.html', + controller: 'ChangePasswordModalCtrl', + controllerAs: 'changePasswordModal', + backdrop: 'static', + size: 'confirm', + resolve: { + CurrentUser: function () { + return currentUser; + } + } + }).result; + + } + + return service; +} \ No newline at end of file diff --git a/src/app/account/js/changePassword.modal.controller.js b/src/app/account/js/changePassword.modal.controller.js new file mode 100644 index 00000000..60927232 --- /dev/null +++ b/src/app/account/js/changePassword.modal.controller.js @@ -0,0 +1,31 @@ +angular.module('orderCloud') + .controller('ChangePasswordModalCtrl', ChangePasswordModalController); + +function ChangePasswordModalController($exceptionHandler, sdkOrderCloud, $uibModalInstance, CurrentUser, clientid, scope) { + var vm = this; + vm.currentUser = CurrentUser; + + vm.submit = function () { + var checkPasswordCredentials = { + Username: vm.currentUser.Username, + Password: vm.currentUser.CurrentPassword + }; + + return vm.loading = sdkOrderCloud.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) + .then(function () { + return sdkOrderCloud.Me.ResetPasswordByToken({ + NewPassword: vm.currentUser.NewPassword + }) + .then(function () { + $uibModalInstance.close(); + }); + }) + .catch(function (ex) { + $exceptionHandler(ex); + }); + }; + + vm.cancel = function () { + $uibModalInstance.dismiss(); + }; +} \ No newline at end of file diff --git a/src/app/account/js/confirmPassword.modal.controller.js b/src/app/account/js/confirmPassword.modal.controller.js new file mode 100644 index 00000000..113978ae --- /dev/null +++ b/src/app/account/js/confirmPassword.modal.controller.js @@ -0,0 +1,32 @@ +angular.module('orderCloud') + .controller('ConfirmPasswordModalCtrl', ConfirmPasswordModalController); + +function ConfirmPasswordModalController($exceptionHandler, $uibModalInstance, CurrentUser, $cookies, sdkOrderCloud, appname, clientid, scope) { + var vm = this; + + vm.submit = function () { + var checkPasswordCredentials = { + Username: CurrentUser.Username, + Password: vm.password + }; + + sdkOrderCloud.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) + .then(function () { + var expiresIn = new Date(); + expiresIn.setMinutes(expiresIn.getMinutes() + 20); + $cookies.put('oc_has_confirmed.' + appname, true, { + expires: expiresIn + }); + $uibModalInstance.close(); + }) + .catch(function (ex) { + $exceptionHandler(ex); + vm.password = null; + vm.form.ConfirmPassword.$$element.focus(); + }); + }; + + vm.cancel = function () { + $uibModalInstance.dismiss(); + }; +} \ No newline at end of file diff --git a/src/app/account/templates/account.tpl.html b/src/app/account/templates/account.tpl.html index 16a37c58..fa9d4132 100644 --- a/src/app/account/templates/account.tpl.html +++ b/src/app/account/templates/account.tpl.html @@ -21,22 +21,37 @@ <article class="col-md-9" cg-busy="application.stateLoading('account')" ui-view> <h3><i class="fa fa-cog"></i> My Account</h3> <hr> - <div class="panel panel-default"> - <div class="panel-body"> - <div class="row"> - <div class="col-sm-5"> - <h5><b>Name:</b> <span class="pull-right">{{accountInfo.profile.FirstName + ' ' + accountInfo.profile.LastName}}</span></h5> - <h5><b>Email Address:</b> <span class="pull-right">{{accountInfo.profile.Email}}</span></h5> - <h5><b>Username:</b> <span class="pull-right">{{accountInfo.profile.Username}}</span></h5> - <h5><b>Phone Number:</b> <span class="pull-right">{{accountInfo.profile.Phone}}</span></h5> - <hr class="visible-xs visible-sm"> - </div> - <div class="col-sm-7 text-right"> - <button type="button" class="btn btn-default" ng-click="accountInfo.editInfo()"><i class="fa fa-edit"></i> Edit Profile</button> - <button type="button" class="btn btn-default" ng-click="accountInfo.changePassword(accountInfo.currentUser)"><i class="fa fa-lock"></i> Change Password</button> - </div> + <form class="progressive" name="account.profileForm" autocomplete="off" novalidate ng-submit="account.updateProfile()" oc-readonly-roles="MeAdmin" + pretty-submit> + <fieldset class="form-group row"> + <div class="col-xs-6"> + <label for="FirstName">First name</label> + <input id="FirstName" name="FirstName" type="text" class="form-control" ng-model="account.profile.FirstName" required> </div> - </div> - </div> + <div class="col-xs-6"> + <label for="LastName">Last name</label> + <input id="LastName" name="LastName" type="text" class="form-control" ng-model="account.profile.LastName" required> + </div> + </fieldset> + <fieldset class="form-group"> + <label for="Email">Email address</label> + <input id="Email" name="Email" type="email" class="form-control" ng-model="account.profile.Email" required> + </fieldset> + <fieldset class="form-group"> + <label for="Phone">Phone number</label> + <input id="Phone" name="Phone" type="tel" placeholder="(Optional)" class="form-control" ng-model="account.profile.Phone"> + </fieldset> + <button type="submit" class="btn btn-default" oc-if-roles="MeAdmin">Update profile</button> + <button type="button" class="btn btn-default" oc-if-roles="MeAdmin" ng-click="account.changePassword()"><i class="fa fa-lock"></i> Change Password</button> + </form> + <hr> + <form name="account.settingsForm" ng-submit="account.updateUsername()" autocomplete="off" novalidate oc-readonly-roles="MeAdmin" + pretty-submit> + <fieldset class="form-group"> + <label for="Username">Username</label> + <input id="Username" name="Username" ng-change="account.usernameChange()" type="text" class="form-control" ng-model="account.profile.Username" required> + </fieldset> + <button type="submit" class="btn btn-default" oc-if-roles="MeAdmin">Update username</button> + </form> </article> </div> \ No newline at end of file diff --git a/src/app/account/templates/accountSettings.modal.tpl.html b/src/app/account/templates/accountSettings.modal.html similarity index 100% rename from src/app/account/templates/accountSettings.modal.tpl.html rename to src/app/account/templates/accountSettings.modal.html diff --git a/src/app/account/templates/changePassword.modal.tpl.html b/src/app/account/templates/changePassword.modal.html similarity index 54% rename from src/app/account/templates/changePassword.modal.tpl.html rename to src/app/account/templates/changePassword.modal.html index 32b9e297..b97be733 100644 --- a/src/app/account/templates/changePassword.modal.tpl.html +++ b/src/app/account/templates/changePassword.modal.html @@ -1,7 +1,7 @@ -<form name="ChangePasswordForm" ng-submit="changePasswordModal.changePassword(changePasswordModal.currentUser)" novalidate autocomplete="off"> +<form name="ChangePasswordForm" ng-submit="changePasswordModal.submit()" novalidate autocomplete="off"> <div class="modal-header"> <button type="button" class="close" aria-label="Close" ng-click="changePasswordModal.cancel()"><span aria-hidden="true">×</span></button> - <h3 class="modal-title"><i class="fa fa-lock"></i> Change Password</h3> + <h4 class="modal-title"><i class="fa fa-lock"></i> Change Password</h4> </div> <div class="modal-body"> <div class="form-group"> @@ -11,17 +11,21 @@ <h3 class="modal-title"><i class="fa fa-lock"></i> Change Password</h3> </div> <div class="form-group"> <label>New Password</label> - <input type="password" ng-model="changePasswordModal.currentUser.NewPassword" pattern="^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!$%@#£€*?&]{8,}$" pattern-err-type="customPassword" class="form-control" confirmpassword="{{changePasswordModal.currentUser.ConfirmPassword}}" required /> + <input type="password" ng-model="changePasswordModal.currentUser.NewPassword" pattern="^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!$%@#£€*?&]{8,}$" + pattern-err-type="customPassword" class="form-control" confirmpassword="{{changePasswordModal.currentUser.ConfirmPassword}}" + required /> </div> <div class="form-group"> <label>Confirm Password</label> - <input type="password" ng-model="changePasswordModal.currentUser.ConfirmPassword" pattern="^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!$%@#£€*?&]{8,}$" pattern-err-type="customPassword" class="form-control" confirmpassword="{{changePasswordModal.currentUser.NewPassword}}" required /> + <input type="password" ng-model="changePasswordModal.currentUser.ConfirmPassword" pattern="^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!$%@#£€*?&]{8,}$" + pattern-err-type="customPassword" class="form-control" confirmpassword="{{changePasswordModal.currentUser.NewPassword}}" + required /> </div> </div> </div> <div class="modal-footer"> - <button type="submit" class="btn btn-primary btn-block" - ng-disabled="ChangePasswordForm.$invalid || changePasswordModal.currentUser.NewPassword != changePasswordModal.currentUser.ConfirmPassword" - ng-click="changePasswordModal.submit()">Update Password</button> + <button type="submit" class="btn btn-primary btn-block" ng-disabled="ChangePasswordForm.$invalid || changePasswordModal.currentUser.NewPassword != changePasswordModal.currentUser.ConfirmPassword"> + Update Password + </button> </div> -</form> +</form> \ No newline at end of file diff --git a/src/app/account/templates/confirmPassword.modal.html b/src/app/account/templates/confirmPassword.modal.html new file mode 100644 index 00000000..abf7d20f --- /dev/null +++ b/src/app/account/templates/confirmPassword.modal.html @@ -0,0 +1,16 @@ +<form name="confirmPasswordModal.form" ng-submit="confirmPasswordModal.submit()"> + <div class="modal-header"> + <button type="button" class="close" aria-label="Close" ng-click="confirmPasswordModal.cancel()"><span aria-hidden="true">×</span></button> + <h4 class="modal-title">Confirm Your Password</h4> + </div> + <div class="modal-body"> + <div class="form-group"> + <label for="ConfirmPassword">Please enter your password to continue</label> + <input id="ConfirmPassword" name="ConfirmPassword" type="password" ng-model="confirmPasswordModal.password" class="form-control" + autofocus required /> + </div> + </div> + <div class="modal-footer"> + <button class="btn btn-primary btn-block" type="submit" ng-disabled="confirmPasswordModal.form.$invalid">Update Profile</button> + </div> +</form> \ No newline at end of file diff --git a/src/app/account/templates/confirmPassword.modal.tpl.html b/src/app/account/templates/confirmPassword.modal.tpl.html deleted file mode 100644 index a45e971f..00000000 --- a/src/app/account/templates/confirmPassword.modal.tpl.html +++ /dev/null @@ -1,15 +0,0 @@ -<form name="ConfirmPasswordForm" ng-submit="confirmPassword.submit()"> - <div class="modal-header"> - <button type="button" class="close" aria-label="Close" ng-click="confirmPassword.cancel()"><span aria-hidden="true">×</span></button> - <h3 class="modal-title"><i class="fa fa-lock"></i> Confirm Your Password</h3> - </div> - <div class="modal-body"> - <div class="form-group"> - <label>Please enter your password to continue</label> - <input type="password" ng-model="confirmPassword.password" class="form-control" autofocus required /> - </div> - </div> - <div class="modal-footer"> - <button class="btn btn-primary btn-block" type="submit" ng-disabled="ConfirmPasswordForm.$invalid">Update Profile</button> - </div> -</form> diff --git a/src/app/app.constants.json b/src/app/app.constants.json index 29773f49..55381fc5 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,6 +1,6 @@ { "appname": "Angular Buyer", - "scope": ["MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper"], + "scope": ["MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper PasswordReset"], "clientid": "AEFFD7B0-C7A4-4E68-AB31-15B454964A7B", "buyerid": "EXO-1E", "anonymous": false, From 5eec68a62feb0bea2a19357d14467905d2a3d3ab Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 10:19:12 -0500 Subject: [PATCH 051/158] OC-2044 Add Logout button to Account --- src/app/account/templates/account.tpl.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/account/templates/account.tpl.html b/src/app/account/templates/account.tpl.html index fa9d4132..df03aa69 100644 --- a/src/app/account/templates/account.tpl.html +++ b/src/app/account/templates/account.tpl.html @@ -53,5 +53,7 @@ <h3><i class="fa fa-cog"></i> My Account</h3> </fieldset> <button type="submit" class="btn btn-default" oc-if-roles="MeAdmin">Update username</button> </form> + <hr> + <button type="button" class="btn btn-danger btn-block" ng-click="application.logout()"><i class="fa fa-power-off"></i> Logout</button> </article> </div> \ No newline at end of file From 4d0522cff3baa212769781f6901e7bb1b1f222f2 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 10:49:30 -0500 Subject: [PATCH 052/158] OC-2050 My Account: Favorites tabs (orders/products); no-matches additions for other Account tabs --- .../templates/favoriteProducts.tpl.html | 6 +++--- .../myAddresses/templates/myAddresses.tpl.html | 8 ++++++-- .../myPayments/templates/myPayments.tpl.html | 17 ++++++++--------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/app/favoriteProducts/templates/favoriteProducts.tpl.html b/src/app/favoriteProducts/templates/favoriteProducts.tpl.html index e3f51175..1edcc183 100644 --- a/src/app/favoriteProducts/templates/favoriteProducts.tpl.html +++ b/src/app/favoriteProducts/templates/favoriteProducts.tpl.html @@ -1,6 +1,6 @@ <article id="favoriteProducts"> <div class="form-group c-form-group"> - <form class="form-inline pull-right"> + <form class="form-inline pull-right" ng-if="favoriteProducts.list"> <fieldset class="form-group c-form-group_form-group"><!-- c-form-group_form-group --> <label for="SortSelect" class="c-form-group_form-group--label">Sort By:</label> <div style="display:inline-table" ng-class="{'input-group':favoriteProducts.sortSelection}"> @@ -24,13 +24,13 @@ </fieldset> </form> <!--END FILTERS--> - <h5 class="pull-left"> + <h5 class="pull-left" ng-if="favoriteProducts.list"> <b>{{(application.$ocMedia('min-width:768px') ? favoriteProducts.list.Meta.ItemRange[0] : '1') + ' - ' + favoriteProducts.list.Meta.ItemRange[1] + ' of ' + favoriteProducts.list.Meta.TotalCount + ' results'}}</b> </h5> <div class="clearfix"></div> </div> <div class="no-matches" ng-if="!favoriteProducts.list"> - <b>No matches found.</b> + <b>You currently do not have any favorite products.</b> </div> <div ng-if="favoriteProducts.list.Items.length"> <div class="row l-product-grid"> diff --git a/src/app/myAddresses/templates/myAddresses.tpl.html b/src/app/myAddresses/templates/myAddresses.tpl.html index ec17180d..3d3c5a77 100644 --- a/src/app/myAddresses/templates/myAddresses.tpl.html +++ b/src/app/myAddresses/templates/myAddresses.tpl.html @@ -7,12 +7,16 @@ <h3><i class="fa fa-map-marker"></i> Personal Addresses</h3> <div class="panel panel-default" cg-busy="myAddresses.loading[$index]"> <div class="panel-body"> <div class="pull-right"> - <a href="" ng-click="myAddresses.delete(this)">Delete</a> | - <a href="" ng-click="myAddresses.edit(this)">Edit</a> + <a ng-click="myAddresses.delete(this)">Delete</a> | + <a ng-click="myAddresses.edit(this)">Edit</a> </div> <p ng-bind-html="address | address:'full'"></p> </div> </div> </div> + <div class="no-matches" ng-if="!myAddresses.list.Items.length"> + You have not created any personal addresses. <br> + <a ng-click="myAddresses.create()">Create one now!</a> + </div> </div> </article> \ No newline at end of file diff --git a/src/app/myPayments/templates/myPayments.tpl.html b/src/app/myPayments/templates/myPayments.tpl.html index 0409a808..5a62132b 100644 --- a/src/app/myPayments/templates/myPayments.tpl.html +++ b/src/app/myPayments/templates/myPayments.tpl.html @@ -24,14 +24,13 @@ <h3><i class="fa fa-credit-card"></i> Personal Credit Cards</h3> </div> </div> </div> + <div class="no-matches" ng-if="!myPayments.personalCreditCards.Items.length"> + You have not created any personal credit cards. <br> + <a href="" ng-click="myPayments.createCreditCard()">Create one now!</a> + </div> </div> - - <div class="no-matches" ng-if="!myPayments.personalCreditCards"> - You have not created any personal credit cards. <br> - <a href="" ng-click="myPayments.createCreditCard()">Creat one now!</a> - </div> - <br ng-if="myPayments.personalSpendingAccounts"> - <div ng-if="myPayments.personalSpendingAccounts"> + <br ng-if="myPayments.personalSpendingAccounts.Items.length"> + <div ng-if="myPayments.personalSpendingAccounts.Items.length"> <h3><i class="fa fa-money"></i> Available Spending Accounts</h3> <hr> <div class="panel panel-default" ng-repeat="spendingAccount in myPayments.personalSpendingAccounts.Items"> @@ -59,8 +58,8 @@ <h3><i class="fa fa-money"></i> Available Spending Accounts</h3> </div> </div> </div> - <br ng-if="myPayments.giftCards"> - <div ng-if="myPayments.giftCards"> + <br ng-if="myPayments.giftCards.Items.length"> + <div ng-if="myPayments.giftCards.Items.length"> <h3><i class="fa fa-gift"></i> Available Gift Cards</h3> <hr> <div class="panel panel-default" ng-repeat="giftCard in myPayments.giftCards.Items"> From f6def97a9902ca5115bac15ccc921e3bb769bc73 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 11:37:01 -0500 Subject: [PATCH 053/158] SDK Update: Account, My Addresses, My Payments, Favorite Products --- src/app/account/js/account.config.js | 2 +- .../{account.tpl.html => account.html} | 0 .../payment/directives/payment.directives.js | 4 +- .../checkout/shipping/checkout.shipping.js | 4 +- src/app/favoriteProducts/favoriteProducts.js | 174 ------------------ .../js/favoriteProduct.controller.js | 68 +++++++ .../js/favoriteProducts.config.js | 30 +++ .../js/favoriteProducts.controller.js | 67 +++++++ .../js/favoriteProducts.directive.js | 16 ++ ...roducts.tpl.html => favoriteProducts.html} | 0 ....html => ordercloud-favorite-product.html} | 0 src/app/myAddresses/js/myAddresses.config.js | 25 +++ .../myAddresses.controller.js} | 28 +-- src/app/myAddresses/js/myAddresses.service.js | 34 ++++ .../js/myAddressesCreate.modal.controller.js | 33 ++++ .../js/myAddressesEdit.modal.controller.js | 32 ++++ .../myAddresses/myAddresses.modalFactory.js | 95 ---------- ...tpl.html => myAddresses.create.modal.html} | 0 ...l.tpl.html => myAddresses.edit.modal.html} | 0 ...{myAddresses.tpl.html => myAddresses.html} | 0 src/app/myPayments/js/myPayments.config.js | 37 ++++ .../myPayments.controller.js} | 32 +--- src/app/myPayments/js/myPayments.service.js | 34 ++++ ...ymentsCreateCreditCard.modal.controller.js | 30 +++ ...PaymentsEditCreditCard.modal.controller.js | 31 ++++ .../myPaymentCreditCard.modalFactory.js | 91 --------- .../{myPayments.tpl.html => myPayments.html} | 0 ...=> myPaymentsCreditCard.create.modal.html} | 0 ...l => myPaymentsCreditCard.edit.modal.html} | 0 29 files changed, 449 insertions(+), 418 deletions(-) rename src/app/account/templates/{account.tpl.html => account.html} (100%) delete mode 100644 src/app/favoriteProducts/favoriteProducts.js create mode 100644 src/app/favoriteProducts/js/favoriteProduct.controller.js create mode 100644 src/app/favoriteProducts/js/favoriteProducts.config.js create mode 100644 src/app/favoriteProducts/js/favoriteProducts.controller.js create mode 100644 src/app/favoriteProducts/js/favoriteProducts.directive.js rename src/app/favoriteProducts/templates/{favoriteProducts.tpl.html => favoriteProducts.html} (100%) rename src/app/favoriteProducts/templates/{ordercloud-favorite-product.tpl.html => ordercloud-favorite-product.html} (100%) create mode 100644 src/app/myAddresses/js/myAddresses.config.js rename src/app/myAddresses/{myAddresses.js => js/myAddresses.controller.js} (55%) create mode 100644 src/app/myAddresses/js/myAddresses.service.js create mode 100644 src/app/myAddresses/js/myAddressesCreate.modal.controller.js create mode 100644 src/app/myAddresses/js/myAddressesEdit.modal.controller.js delete mode 100644 src/app/myAddresses/myAddresses.modalFactory.js rename src/app/myAddresses/templates/{myAddresses.create.modal.tpl.html => myAddresses.create.modal.html} (100%) rename src/app/myAddresses/templates/{myAddresses.edit.modal.tpl.html => myAddresses.edit.modal.html} (100%) rename src/app/myAddresses/templates/{myAddresses.tpl.html => myAddresses.html} (100%) create mode 100644 src/app/myPayments/js/myPayments.config.js rename src/app/myPayments/{myPayments.js => js/myPayments.controller.js} (55%) create mode 100644 src/app/myPayments/js/myPayments.service.js create mode 100644 src/app/myPayments/js/myPaymentsCreateCreditCard.modal.controller.js create mode 100644 src/app/myPayments/js/myPaymentsEditCreditCard.modal.controller.js delete mode 100644 src/app/myPayments/myPaymentCreditCard.modalFactory.js rename src/app/myPayments/templates/{myPayments.tpl.html => myPayments.html} (100%) rename src/app/myPayments/templates/{myPaymentsCreditCard.create.modal.tpl.html => myPaymentsCreditCard.create.modal.html} (100%) rename src/app/myPayments/templates/{myPaymentsCreditCard.edit.modal.tpl.html => myPaymentsCreditCard.edit.modal.html} (100%) diff --git a/src/app/account/js/account.config.js b/src/app/account/js/account.config.js index a2ce4df1..9786e526 100644 --- a/src/app/account/js/account.config.js +++ b/src/app/account/js/account.config.js @@ -7,7 +7,7 @@ function AccountConfig($stateProvider) { .state('account', { parent: 'base', url: '/account', - templateUrl: 'account/templates/account.tpl.html', + templateUrl: 'account/templates/account.html', controller: 'AccountCtrl', controllerAs: 'account', data: { diff --git a/src/app/account/templates/account.tpl.html b/src/app/account/templates/account.html similarity index 100% rename from src/app/account/templates/account.tpl.html rename to src/app/account/templates/account.html diff --git a/src/app/checkout/payment/directives/payment.directives.js b/src/app/checkout/payment/directives/payment.directives.js index 41d5cd0e..8d24431d 100644 --- a/src/app/checkout/payment/directives/payment.directives.js +++ b/src/app/checkout/payment/directives/payment.directives.js @@ -169,7 +169,7 @@ function OCPaymentCreditCard() { } } -function PaymentCreditCardController($scope, $rootScope, toastr, $filter, OrderCloud, MyPaymentCreditCardModal, $exceptionHandler) { +function PaymentCreditCardController($scope, $rootScope, toastr, $filter, OrderCloud, ocMyCreditCards, $exceptionHandler) { OrderCloud.Me.ListCreditCards(null, 1, 100, null, null, {}) .then(function(data) { $scope.creditCards = data.Items; @@ -233,7 +233,7 @@ function PaymentCreditCardController($scope, $rootScope, toastr, $filter, OrderC }; $scope.createCreditCard = function() { - MyPaymentCreditCardModal.Create() + ocMyCreditCards.Create() .then(function(card) { toastr.success('Credit Card Created', 'Success'); $scope.creditCards.push(card); diff --git a/src/app/checkout/shipping/checkout.shipping.js b/src/app/checkout/shipping/checkout.shipping.js index 9f30c47a..6478b8ed 100644 --- a/src/app/checkout/shipping/checkout.shipping.js +++ b/src/app/checkout/shipping/checkout.shipping.js @@ -12,7 +12,7 @@ function checkoutShippingConfig($stateProvider) { }); } -function CheckoutShippingController($exceptionHandler, $rootScope, toastr, OrderCloud, MyAddressesModal, AddressSelectModal, ShippingRates, CheckoutConfig) { +function CheckoutShippingController($exceptionHandler, $rootScope, toastr, OrderCloud, ocMyAddresses, AddressSelectModal, ShippingRates, CheckoutConfig) { var vm = this; vm.createAddress = createAddress; vm.changeShippingAddress = changeShippingAddress; @@ -23,7 +23,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, Order vm.analyzeShipments = analyzeShipments; function createAddress(order) { - MyAddressesModal.Create() + ocMyAddresses.Create() .then(function(address) { toastr.success('Address Created', 'Success'); order.ShippingAddressID = address.ID; diff --git a/src/app/favoriteProducts/favoriteProducts.js b/src/app/favoriteProducts/favoriteProducts.js deleted file mode 100644 index 96a2aabd..00000000 --- a/src/app/favoriteProducts/favoriteProducts.js +++ /dev/null @@ -1,174 +0,0 @@ -angular.module('orderCloud') - .config(FavoriteProductsConfig) - .directive('ordercloudFavoriteProduct', FavoriteProductDirective) - .controller('FavoriteProductsCtrl', FavoriteProductsController) - .controller('FavoriteProductCtrl', FavoriteProductController) -; - -function FavoriteProductsConfig($stateProvider){ - $stateProvider - .state('favoriteProducts', { - parent: 'account', - templateUrl: 'favoriteProducts/templates/favoriteProducts.tpl.html', - url: '/favorite-products?search?page?pageSize?searchOn?sortBy?filters?depth', - controller: 'FavoriteProductsCtrl', - controllerAs: 'favoriteProducts', - data: { - pageTitle: "Favorite Products" - }, - resolve: { - Parameters: function ($stateParams, ocParameters) { - return ocParameters.Get($stateParams); - }, - FavoriteProducts: function(OrderCloud, Parameters, CurrentUser){ - if (CurrentUser.xp && CurrentUser.xp.FavoriteProducts.length) { - return OrderCloud.Me.ListProducts(Parameters.search, Parameters.page, Parameters.pageSize || 6, Parameters.searchOn, Parameters.sortBy, {ID: CurrentUser.xp.FavoriteProducts.join('|')}); - } else { - return null; - } - } - } - }); -} - -function FavoriteProductsController(ocParameters, OrderCloud, $state, $ocMedia, Parameters, CurrentUser, FavoriteProducts){ - var vm = this; - vm.currentUser = CurrentUser; - vm.list = FavoriteProducts; - vm.parameters = Parameters; - - vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; - - //Filtering and Search Functionality - //check if filters are applied - vm.filtersApplied = vm.parameters.filters || ($ocMedia('max-width: 767px') && vm.sortSelection); - vm.showFilters = vm.filtersApplied; - - - //reload the state with new filters - vm.filter = function(resetPage) { - $state.go('.', ocParameters.Create(vm.parameters, resetPage)); - }; - - //clear the relevant filters, reload the state & reset the page - vm.clearFilters = function() { - vm.parameters.filters = null; - $ocMedia('max-width: 767px') ? vm.parameters.sortBy = null : angular.noop(); - vm.filter(true); - }; - - 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.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() { - $state.go('.', { - page: vm.list.Meta.Page - }); - }; - - //load the next page of results with all the same parameters - vm.loadMore = function() { - return OrderCloud.Me.ListProducts(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 FavoriteProductDirective(){ - return { - scope: { - currentUser: '=', - product: '=' - }, - restrict: 'E', - templateUrl: 'favoriteProducts/templates/ordercloud-favorite-product.tpl.html', - controller: 'FavoriteProductCtrl', - controllerAs: 'favoriteProduct' - }; -} - -function FavoriteProductController($scope, OrderCloud, toastr){ - var vm = this; - vm.checkHasFavorites = checkHasFavorites; - vm.toggleFavoriteProduct = toggleFavoriteProduct; - vm.addProduct = addProduct; - vm.removeProduct = removeProduct; - - vm.checkHasFavorites(); - vm.isFavorited = vm.hasFavorites && $scope.currentUser.xp.FavoriteProducts.indexOf($scope.product.ID) > -1; - - function toggleFavoriteProduct(){ - if (vm.hasFavorites){ - if (vm.isFavorited){ - removeProduct(); - } else { - addProduct($scope.currentUser.xp.FavoriteProducts); - } - } else { - addProduct([]); - } - } - - function checkHasFavorites(){ - if($scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts){ - vm.hasFavorites = true; - } - else{ - if($scope.currentUser && $scope.currentUser.xp){ - $scope.currentUser.xp.FavoriteProducts = []; - }else{ - $scope.currentUser.xp ={}; - $scope.currentUser.xp.FavoriteProducts = []; - } - OrderCloud.Me.Patch( {xp:$scope.currentUser.xp}) - .then(function(){ - vm.hasFavorites = true; - }) - .catch(function(ex){ - console.log(ex); - }); - } - } - - function addProduct(existingList){ - existingList.push($scope.product.ID); - OrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) - .then(function(data){ - vm.hasFavorites = data.xp && data.xp.FavoriteProducts; - vm.isFavorited = true; - toastr.success($scope.product.Name + ' was added to your favorites'); - }); - } - - function removeProduct(){ - var updatedList = _.without($scope.currentUser.xp.FavoriteProducts, $scope.product.ID); - OrderCloud.Me.Patch({xp: {FavoriteProducts: updatedList}}) - .then(function(){ - vm.isFavorited = false; - $scope.currentUser.xp.FavoriteProducts = updatedList; - toastr.success($scope.product.Name + ' was removed from your favorites'); - }); - } - -} - diff --git a/src/app/favoriteProducts/js/favoriteProduct.controller.js b/src/app/favoriteProducts/js/favoriteProduct.controller.js new file mode 100644 index 00000000..6aa08fc2 --- /dev/null +++ b/src/app/favoriteProducts/js/favoriteProduct.controller.js @@ -0,0 +1,68 @@ +angular.module('orderCloud') + .controller('FavoriteProductCtrl', FavoriteProductController) +; + +function FavoriteProductController($scope, sdkOrderCloud, toastr){ + var vm = this; + vm.checkHasFavorites = checkHasFavorites; + vm.toggleFavoriteProduct = toggleFavoriteProduct; + vm.addProduct = addProduct; + vm.removeProduct = removeProduct; + + vm.checkHasFavorites(); + vm.isFavorited = vm.hasFavorites && $scope.currentUser.xp.FavoriteProducts.indexOf($scope.product.ID) > -1; + + function toggleFavoriteProduct(){ + if (vm.hasFavorites){ + if (vm.isFavorited){ + removeProduct(); + } else { + addProduct($scope.currentUser.xp.FavoriteProducts); + } + } else { + addProduct([]); + } + } + + function checkHasFavorites(){ + if($scope.currentUser && $scope.currentUser.xp && $scope.currentUser.xp.FavoriteProducts){ + vm.hasFavorites = true; + } + else{ + if($scope.currentUser && $scope.currentUser.xp){ + $scope.currentUser.xp.FavoriteProducts = []; + }else{ + $scope.currentUser.xp ={}; + $scope.currentUser.xp.FavoriteProducts = []; + } + sdkOrderCloud.Me.Patch({xp:$scope.currentUser.xp}) + .then(function(){ + vm.hasFavorites = true; + }) + .catch(function(ex){ + console.log(ex); + }); + } + } + + function addProduct(existingList){ + existingList.push($scope.product.ID); + sdkOrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) + .then(function(data){ + vm.hasFavorites = data.xp && data.xp.FavoriteProducts; + vm.isFavorited = true; + toastr.success($scope.product.Name + ' was added to your favorites'); + }); + } + + function removeProduct(){ + var updatedList = _.without($scope.currentUser.xp.FavoriteProducts, $scope.product.ID); + sdkOrderCloud.Me.Patch({xp: {FavoriteProducts: updatedList}}) + .then(function(){ + vm.isFavorited = false; + $scope.currentUser.xp.FavoriteProducts = updatedList; + toastr.success($scope.product.Name + ' was removed from your favorites'); + }); + } + +} \ No newline at end of file diff --git a/src/app/favoriteProducts/js/favoriteProducts.config.js b/src/app/favoriteProducts/js/favoriteProducts.config.js new file mode 100644 index 00000000..3b9442bb --- /dev/null +++ b/src/app/favoriteProducts/js/favoriteProducts.config.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .config(FavoriteProductsConfig) +; + +function FavoriteProductsConfig($stateProvider){ + $stateProvider + .state('favoriteProducts', { + parent: 'account', + templateUrl: 'favoriteProducts/templates/favoriteProducts.html', + url: '/favorite-products?search?page?pageSize?searchOn?sortBy?filters?depth', + controller: 'FavoriteProductsCtrl', + controllerAs: 'favoriteProducts', + data: { + pageTitle: "Favorite Products" + }, + resolve: { + Parameters: function ($stateParams, ocParameters) { + return ocParameters.Get($stateParams); + }, + FavoriteProducts: function(sdkOrderCloud, Parameters, CurrentUser){ + if (CurrentUser.xp && CurrentUser.xp.FavoriteProducts.length) { + var parameters = angular.extend(Parameters, {pageSize: Parameters.pageSize || 6, filters: {ID: CurrentUser.xp.FavoriteProducts.join('|')}}); + return sdkOrderCloud.Me.ListProducts(parameters); + } else { + return null; + } + } + } + }); +} \ No newline at end of file diff --git a/src/app/favoriteProducts/js/favoriteProducts.controller.js b/src/app/favoriteProducts/js/favoriteProducts.controller.js new file mode 100644 index 00000000..f93cc3d1 --- /dev/null +++ b/src/app/favoriteProducts/js/favoriteProducts.controller.js @@ -0,0 +1,67 @@ +angular.module('orderCloud') + .controller('FavoriteProductsCtrl', FavoriteProductsController) +; + +function FavoriteProductsController(ocParameters, sdkOrderCloud, $state, $ocMedia, Parameters, CurrentUser, FavoriteProducts){ + var vm = this; + vm.currentUser = CurrentUser; + vm.list = FavoriteProducts; + vm.parameters = Parameters; + + vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; + + //Filtering and Search Functionality + //check if filters are applied + vm.filtersApplied = vm.parameters.filters || ($ocMedia('max-width: 767px') && vm.sortSelection); + vm.showFilters = vm.filtersApplied; + + + //reload the state with new filters + vm.filter = function(resetPage) { + $state.go('.', ocParameters.Create(vm.parameters, resetPage)); + }; + + //clear the relevant filters, reload the state & reset the page + vm.clearFilters = function() { + vm.parameters.filters = null; + $ocMedia('max-width: 767px') ? vm.parameters.sortBy = null : angular.noop(); + vm.filter(true); + }; + + 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.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() { + $state.go('.', { + page: vm.list.Meta.Page + }); + }; + + //load the next page of results with all the same parameters + vm.loadMore = function() { + var parameters = angular.extend(Parameters, {page:vm.list.Meta.Page + 1}); + return sdkOrderCloud.Me.ListProducts(parameters) + .then(function(data) { + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + }; +} \ No newline at end of file diff --git a/src/app/favoriteProducts/js/favoriteProducts.directive.js b/src/app/favoriteProducts/js/favoriteProducts.directive.js new file mode 100644 index 00000000..05d3b2dd --- /dev/null +++ b/src/app/favoriteProducts/js/favoriteProducts.directive.js @@ -0,0 +1,16 @@ +angular.module('orderCloud') + .directive('ordercloudFavoriteProduct', FavoriteProductDirective) +; + +function FavoriteProductDirective(){ + return { + scope: { + currentUser: '=', + product: '=' + }, + restrict: 'E', + templateUrl: 'favoriteProducts/templates/ordercloud-favorite-product.html', + controller: 'FavoriteProductCtrl', + controllerAs: 'favoriteProduct' + }; +} \ No newline at end of file diff --git a/src/app/favoriteProducts/templates/favoriteProducts.tpl.html b/src/app/favoriteProducts/templates/favoriteProducts.html similarity index 100% rename from src/app/favoriteProducts/templates/favoriteProducts.tpl.html rename to src/app/favoriteProducts/templates/favoriteProducts.html diff --git a/src/app/favoriteProducts/templates/ordercloud-favorite-product.tpl.html b/src/app/favoriteProducts/templates/ordercloud-favorite-product.html similarity index 100% rename from src/app/favoriteProducts/templates/ordercloud-favorite-product.tpl.html rename to src/app/favoriteProducts/templates/ordercloud-favorite-product.html diff --git a/src/app/myAddresses/js/myAddresses.config.js b/src/app/myAddresses/js/myAddresses.config.js new file mode 100644 index 00000000..d5849076 --- /dev/null +++ b/src/app/myAddresses/js/myAddresses.config.js @@ -0,0 +1,25 @@ +angular.module('orderCloud') + .config(MyAddressesConfig) +; + +function MyAddressesConfig($stateProvider) { + $stateProvider + .state('myAddresses', { + parent: 'account', + url: '/addresses', + templateUrl: 'myAddresses/templates/myAddresses.html', + controller: 'MyAddressesCtrl', + controllerAs: 'myAddresses', + data: { + pageTitle: "Personal Addresses" + }, + resolve: { + AddressList: function(sdkOrderCloud) { + var options = { + filters: {Editable: true} + }; + return sdkOrderCloud.Me.ListAddresses(options); + } + } + }); +} \ No newline at end of file diff --git a/src/app/myAddresses/myAddresses.js b/src/app/myAddresses/js/myAddresses.controller.js similarity index 55% rename from src/app/myAddresses/myAddresses.js rename to src/app/myAddresses/js/myAddresses.controller.js index bd42196a..767502a1 100644 --- a/src/app/myAddresses/myAddresses.js +++ b/src/app/myAddresses/js/myAddresses.controller.js @@ -1,32 +1,12 @@ angular.module('orderCloud') - .config(MyAddressesConfig) .controller('MyAddressesCtrl', MyAddressesController) ; -function MyAddressesConfig($stateProvider) { - $stateProvider - .state('myAddresses', { - parent: 'account', - url: '/addresses', - templateUrl: 'myAddresses/templates/myAddresses.tpl.html', - controller: 'MyAddressesCtrl', - controllerAs: 'myAddresses', - data: { - pageTitle: "Personal Addresses" - }, - resolve: { - AddressList: function(OrderCloud) { - return OrderCloud.Me.ListAddresses(null, null, null, null, null, {Editable:true}); - } - } - }); -} - -function MyAddressesController(toastr, OrderCloud, ocConfirm, MyAddressesModal, AddressList) { +function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, AddressList) { var vm = this; vm.list = AddressList; vm.create = function() { - MyAddressesModal.Create() + ocMyAddresses.Create() .then(function(data) { toastr.success('Address Created', 'Success'); vm.list.Items.push(data); @@ -34,7 +14,7 @@ function MyAddressesController(toastr, OrderCloud, ocConfirm, MyAddressesModal, }; vm.edit = function(scope){ - MyAddressesModal.Edit(scope.address) + ocMyAddresses.Edit(scope.address) .then(function(data) { toastr.success('Address Saved', 'Success'); vm.list.Items[scope.$index] = data; @@ -48,7 +28,7 @@ function MyAddressesController(toastr, OrderCloud, ocConfirm, MyAddressesModal, confirmText: 'Delete address', type: 'delete'}) .then(function() { - vm.loading[scope.$index] = OrderCloud.Me.DeleteAddress(scope.address.ID) + vm.loading[scope.$index] = sdkOrderCloud.Me.DeleteAddress(scope.address.ID) .then(function() { toastr.success('Address Deleted', 'Success'); vm.list.Items.splice(scope.$index, 1); diff --git a/src/app/myAddresses/js/myAddresses.service.js b/src/app/myAddresses/js/myAddresses.service.js new file mode 100644 index 00000000..6fd792f6 --- /dev/null +++ b/src/app/myAddresses/js/myAddresses.service.js @@ -0,0 +1,34 @@ +angular.module('orderCloud') + .factory('ocMyAddresses', OrderCloudMyAddressesService) +; + +function OrderCloudMyAddressesService($uibModal) { + return { + Create: _create, + Edit: _edit + }; + + function _create() { + return $uibModal.open({ + templateUrl: 'myAddresses/templates/myAddresses.create.modal.html', + controller: 'CreateAddressModalCtrl', + controllerAs: 'createAddress', + size: 'md' + }).result; + } + + function _edit(address) { + var addressCopy = angular.copy(address); + return $uibModal.open({ + templateUrl: 'myAddresses/templates/myAddresses.edit.modal.html', + controller: 'EditAddressModalCtrl', + controllerAs: 'editAddress', + size: 'md', + resolve: { + SelectedAddress: function() { + return addressCopy; + } + } + }).result; + } +} \ No newline at end of file diff --git a/src/app/myAddresses/js/myAddressesCreate.modal.controller.js b/src/app/myAddresses/js/myAddressesCreate.modal.controller.js new file mode 100644 index 00000000..1b614cf4 --- /dev/null +++ b/src/app/myAddresses/js/myAddressesCreate.modal.controller.js @@ -0,0 +1,33 @@ +angular.module('orderCloud') + .controller('CreateAddressModalCtrl', CreateAddressModalController) +; + +function CreateAddressModalController($q, $exceptionHandler, $uibModalInstance, sdkOrderCloud, ocGeography) { + var vm = this; + vm.countries = ocGeography.Countries; + vm.states = ocGeography.States; + vm.address = { + //defaults selected country to US + Country: 'US', + //default shipping/billing to true for personal addresses + Shipping:true, + Billing: true + }; + + vm.cancel = function() { + $uibModalInstance.dismiss(); + }; + + vm.submit = function() { + vm.loading = { + message:'Creating Address' + }; + vm.loading.promise = sdkOrderCloud.Me.CreateAddress(vm.address) + .then(function(address) { + $uibModalInstance.close(address); + }) + .catch(function(error) { + $exceptionHandler(error); + }); + }; +} \ No newline at end of file diff --git a/src/app/myAddresses/js/myAddressesEdit.modal.controller.js b/src/app/myAddresses/js/myAddressesEdit.modal.controller.js new file mode 100644 index 00000000..bcaa0dd3 --- /dev/null +++ b/src/app/myAddresses/js/myAddressesEdit.modal.controller.js @@ -0,0 +1,32 @@ +angular.module('orderCloud') + .controller('EditAddressModalCtrl', EditAddressModalController) +; + +function EditAddressModalController($exceptionHandler, $uibModalInstance, sdkOrderCloud, ocGeography, SelectedAddress) { + var vm = this; + vm.countries = ocGeography.Countries; + vm.states = ocGeography.States; + vm.address = SelectedAddress; + vm.addressID = angular.copy(SelectedAddress.ID); + + //default shipping/billing to true for personal addresses + vm.address.Shipping = true; + vm.address.Billing = true; + + vm.cancel = function() { + $uibModalInstance.dismiss(); + }; + + vm.submit = function() { + vm.loading = { + message:'Saving Address' + }; + vm.loading.promise = sdkOrderCloud.Me.UpdateAddress(vm.addressID, vm.address) + .then(function(address) { + $uibModalInstance.close(address); + }) + .catch(function(error) { + $exceptionHandler(error); + }); + }; +} \ No newline at end of file diff --git a/src/app/myAddresses/myAddresses.modalFactory.js b/src/app/myAddresses/myAddresses.modalFactory.js deleted file mode 100644 index d782f032..00000000 --- a/src/app/myAddresses/myAddresses.modalFactory.js +++ /dev/null @@ -1,95 +0,0 @@ -angular.module('orderCloud') - .factory('MyAddressesModal', MyAddressesModalFactory) - .controller('CreateAddressModalCtrl', CreateAddressModalController) - .controller('EditAddressModalCtrl', EditAddressModalController) -; - -function MyAddressesModalFactory($uibModal) { - return { - Create: _create, - Edit: _edit - }; - - function _create() { - return $uibModal.open({ - templateUrl: 'myAddresses/templates/myAddresses.create.modal.tpl.html', - controller: 'CreateAddressModalCtrl', - controllerAs: 'createAddress', - size: 'md' - }).result; - } - - function _edit(address) { - var addressCopy = angular.copy(address); - return $uibModal.open({ - templateUrl: 'myAddresses/templates/myAddresses.edit.modal.tpl.html', - controller: 'EditAddressModalCtrl', - controllerAs: 'editAddress', - size: 'md', - resolve: { - SelectedAddress: function() { - return addressCopy; - } - } - }).result; - } -} - -function CreateAddressModalController($q, $exceptionHandler, $uibModalInstance, OrderCloud, ocGeography) { - var vm = this; - vm.countries = ocGeography.Countries; - vm.states = ocGeography.States; - vm.address = { - //defaults selected country to US - Country: 'US', - //default shipping/billing to true for personal addresses - Shipping:true, - Billing: true - }; - - vm.cancel = function() { - $uibModalInstance.dismiss(); - }; - - vm.submit = function() { - vm.loading = { - message:'Creating Address' - }; - vm.loading.promise = OrderCloud.Me.CreateAddress(vm.address) - .then(function(address) { - $uibModalInstance.close(address); - }) - .catch(function(error) { - $exceptionHandler(error); - }); - }; -} - -function EditAddressModalController($exceptionHandler, $uibModalInstance, OrderCloud, ocGeography, SelectedAddress) { - var vm = this; - vm.countries = ocGeography.Countries; - vm.states = ocGeography.States; - vm.address = SelectedAddress; - vm.addressID = angular.copy(SelectedAddress.ID); - - //default shipping/billing to true for personal addresses - vm.address.Shipping = true; - vm.address.Billing = true; - - vm.cancel = function() { - $uibModalInstance.dismiss(); - }; - - vm.submit = function() { - vm.loading = { - message:'Saving Address' - }; - vm.loading.promise = OrderCloud.Me.UpdateAddress(vm.addressID, vm.address) - .then(function(address) { - $uibModalInstance.close(address); - }) - .catch(function(error) { - $exceptionHandler(error); - }); - }; -} \ No newline at end of file diff --git a/src/app/myAddresses/templates/myAddresses.create.modal.tpl.html b/src/app/myAddresses/templates/myAddresses.create.modal.html similarity index 100% rename from src/app/myAddresses/templates/myAddresses.create.modal.tpl.html rename to src/app/myAddresses/templates/myAddresses.create.modal.html diff --git a/src/app/myAddresses/templates/myAddresses.edit.modal.tpl.html b/src/app/myAddresses/templates/myAddresses.edit.modal.html similarity index 100% rename from src/app/myAddresses/templates/myAddresses.edit.modal.tpl.html rename to src/app/myAddresses/templates/myAddresses.edit.modal.html diff --git a/src/app/myAddresses/templates/myAddresses.tpl.html b/src/app/myAddresses/templates/myAddresses.html similarity index 100% rename from src/app/myAddresses/templates/myAddresses.tpl.html rename to src/app/myAddresses/templates/myAddresses.html diff --git a/src/app/myPayments/js/myPayments.config.js b/src/app/myPayments/js/myPayments.config.js new file mode 100644 index 00000000..b394865f --- /dev/null +++ b/src/app/myPayments/js/myPayments.config.js @@ -0,0 +1,37 @@ +angular.module('orderCloud') + .config(MyPaymentsConfig) +; + +function MyPaymentsConfig($stateProvider) { + $stateProvider + .state('myPayments', { + parent: 'account', + url: '/payments', + templateUrl: 'myPayments/templates/myPayments.html', + controller: 'MyPaymentsCtrl', + controllerAs: 'myPayments', + data: { + pageTitle: "Payment Methods" + }, + resolve: { + UserCreditCards: function(sdkOrderCloud) { + var options = { + filters: {Editable: true} + }; + return sdkOrderCloud.Me.ListCreditCards(options); + }, + UserSpendingAccounts: function(sdkOrderCloud) { + var options = { + filters: {RedemptionCode: '!*'} + }; + return sdkOrderCloud.Me.ListSpendingAccounts(options); + }, + GiftCards: function(sdkOrderCloud) { + var options = { + filters: {RedemptionCode: '*'} + }; + return sdkOrderCloud.Me.ListSpendingAccounts(options); + } + } + }); +} \ No newline at end of file diff --git a/src/app/myPayments/myPayments.js b/src/app/myPayments/js/myPayments.controller.js similarity index 55% rename from src/app/myPayments/myPayments.js rename to src/app/myPayments/js/myPayments.controller.js index ae4b26c9..91a60614 100644 --- a/src/app/myPayments/myPayments.js +++ b/src/app/myPayments/js/myPayments.controller.js @@ -1,41 +1,15 @@ 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) { +function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, ocAuthNet, ocMyCreditCards, UserCreditCards, UserSpendingAccounts, GiftCards) { var vm = this; vm.personalCreditCards = UserCreditCards; vm.personalSpendingAccounts = UserSpendingAccounts; vm.giftCards = GiftCards; vm.createCreditCard = function(){ - MyPaymentCreditCardModal.Create() + ocMyCreditCards.Create() .then(function(data) { toastr.success('Credit Card Created', 'Success'); vm.personalCreditCards.Items.push(data); @@ -43,7 +17,7 @@ function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, }; vm.edit = function(scope){ - MyPaymentCreditCardModal.Edit(scope.creditCard) + ocMyCreditCards.Edit(scope.creditCard) .then(function(data){ toastr.success('Credit Card Updated', 'Success'); vm.personalCreditCards.Items[scope.$index] = data; diff --git a/src/app/myPayments/js/myPayments.service.js b/src/app/myPayments/js/myPayments.service.js new file mode 100644 index 00000000..64b920d8 --- /dev/null +++ b/src/app/myPayments/js/myPayments.service.js @@ -0,0 +1,34 @@ +angular.module('orderCloud') + .factory('ocMyCreditCards', OrderCloudMyCreditCardsService) +; + +function OrderCloudMyCreditCardsService($uibModal) { + return { + Create: _create, + Edit: _edit + }; + + function _create() { + return $uibModal.open({ + templateUrl: 'myPayments/templates/myPaymentsCreditCard.create.modal.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.html', + controller: 'EditCreditCardModalCtrl', + controllerAs: 'editCreditCard', + size: 'md', + resolve: { + SelectedCreditCard: function() { + return creditCardCopy; + } + } + }).result; + } +} \ No newline at end of file diff --git a/src/app/myPayments/js/myPaymentsCreateCreditCard.modal.controller.js b/src/app/myPayments/js/myPaymentsCreateCreditCard.modal.controller.js new file mode 100644 index 00000000..ec8028b5 --- /dev/null +++ b/src/app/myPayments/js/myPaymentsCreateCreditCard.modal.controller.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .controller('CreateCreditCardModalCtrl', CreateCreditCardModalController) +; + +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.creditCard.ExpirationMonth = vm.creditCard.ExpirationDate.split('/')[0]; + // vm.creditCard.ExpirationYear = vm.creditCard.ExpirationDate.split('/')[1]; + + vm.loading.promise = ocAuthNet.CreateCreditCard(vm.creditCard) + .then(function(data){ + $uibModalInstance.close(data.ResponseBody); + }) + .catch(function(error){ + $exceptionHandler(error); + }); + }; +} \ No newline at end of file diff --git a/src/app/myPayments/js/myPaymentsEditCreditCard.modal.controller.js b/src/app/myPayments/js/myPaymentsEditCreditCard.modal.controller.js new file mode 100644 index 00000000..0757501d --- /dev/null +++ b/src/app/myPayments/js/myPaymentsEditCreditCard.modal.controller.js @@ -0,0 +1,31 @@ +angular.module('orderCloud') + .controller('EditCreditCardModalCtrl', EditCreditCardModalController) +; + +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.creditCard.ExpirationDate = date.getMonth() + "/" + 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); + }); + }; +} \ No newline at end of file diff --git a/src/app/myPayments/myPaymentCreditCard.modalFactory.js b/src/app/myPayments/myPaymentCreditCard.modalFactory.js deleted file mode 100644 index 314a0868..00000000 --- a/src/app/myPayments/myPaymentCreditCard.modalFactory.js +++ /dev/null @@ -1,91 +0,0 @@ -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.creditCard.ExpirationMonth = vm.creditCard.ExpirationDate.split('/')[0]; - // vm.creditCard.ExpirationYear = vm.creditCard.ExpirationDate.split('/')[1]; - - 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.creditCard.ExpirationDate = date.getMonth() + "/" + 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/templates/myPayments.tpl.html b/src/app/myPayments/templates/myPayments.html similarity index 100% rename from src/app/myPayments/templates/myPayments.tpl.html rename to src/app/myPayments/templates/myPayments.html diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.create.modal.html similarity index 100% rename from src/app/myPayments/templates/myPaymentsCreditCard.create.modal.tpl.html rename to src/app/myPayments/templates/myPaymentsCreditCard.create.modal.html diff --git a/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html b/src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.html similarity index 100% rename from src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.tpl.html rename to src/app/myPayments/templates/myPaymentsCreditCard.edit.modal.html From 6cf66ae747ac3791452c92626963f26b3534df45 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 12:43:57 -0500 Subject: [PATCH 054/158] SDK Update: My Orders --- src/app/account/templates/account.html | 2 +- src/app/app.constants.json | 2 +- .../approvals/js/approvals.config.js} | 2 +- .../approvals/js/approvals.controller.js} | 0 .../approvals/js/approvals.service.js} | 30 +++++++++++++++---- .../approvals/templates/approvals.html} | 0 .../approvals}/templates/approve.modal.html | 0 .../approvals}/tests/orderApprovals.spec.js | 0 src/app/{orders => myOrders}/myOrders.md | 0 .../order}/js/orderDetails.config.js | 6 ++-- .../order}/js/orderDetails.controller.js | 0 .../order/js/orderDetails.service.js} | 6 ++-- .../order}/templates/orderDetails.html | 2 +- .../order}/tests/orderDetails.spec.js | 0 .../orders}/js/orders.config.js | 2 +- .../orders}/js/orders.controller.js | 5 ++-- .../orders/js/orders.service.js} | 14 +++++---- .../orders}/templates/orders.html | 0 .../orders}/tests/orders.spec.js | 0 19 files changed, 48 insertions(+), 23 deletions(-) rename src/app/{orders/orderApprovals/js/orderApprovals.config.js => myOrders/approvals/js/approvals.config.js} (92%) rename src/app/{orders/orderApprovals/js/orderApprovals.controller.js => myOrders/approvals/js/approvals.controller.js} (100%) rename src/app/{orders/orderApprovals/js/oc-approvals.service.js => myOrders/approvals/js/approvals.service.js} (75%) rename src/app/{orders/orderApprovals/templates/orderApprovals.html => myOrders/approvals/templates/approvals.html} (100%) rename src/app/{orders/orderApprovals => myOrders/approvals}/templates/approve.modal.html (100%) rename src/app/{orders/orderApprovals => myOrders/approvals}/tests/orderApprovals.spec.js (100%) rename src/app/{orders => myOrders}/myOrders.md (100%) rename src/app/{orders/orderDetails => myOrders/order}/js/orderDetails.config.js (68%) rename src/app/{orders/orderDetails => myOrders/order}/js/orderDetails.controller.js (100%) rename src/app/{orders/orderDetails/js/oc-orderDetails.service.js => myOrders/order/js/orderDetails.service.js} (75%) rename src/app/{orders/orderDetails => myOrders/order}/templates/orderDetails.html (98%) rename src/app/{orders/orderDetails => myOrders/order}/tests/orderDetails.spec.js (100%) rename src/app/{orders/orderList => myOrders/orders}/js/orders.config.js (91%) rename src/app/{orders/orderList => myOrders/orders}/js/orders.controller.js (94%) rename src/app/{orders/orderList/js/oc-orders.service.js => myOrders/orders/js/orders.service.js} (79%) rename src/app/{orders/orderList => myOrders/orders}/templates/orders.html (100%) rename src/app/{orders/orderList => myOrders/orders}/tests/orders.spec.js (100%) diff --git a/src/app/account/templates/account.html b/src/app/account/templates/account.html index df03aa69..cf343f62 100644 --- a/src/app/account/templates/account.html +++ b/src/app/account/templates/account.html @@ -14,7 +14,7 @@ <a href="" ui-sref="favoriteProducts">Favorite Products</a> </li> <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> - <a href="" ui-sref="orders">Orders</a> + <a href="" ui-sref="orders({tab: 'history'})">Orders</a> </li> </ul> </aside> diff --git a/src/app/app.constants.json b/src/app/app.constants.json index 55381fc5..5d2e3f82 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,6 +1,6 @@ { "appname": "Angular Buyer", - "scope": ["MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper PasswordReset"], + "scope": ["BuyerReader MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper PasswordReset"], "clientid": "AEFFD7B0-C7A4-4E68-AB31-15B454964A7B", "buyerid": "EXO-1E", "anonymous": false, diff --git a/src/app/orders/orderApprovals/js/orderApprovals.config.js b/src/app/myOrders/approvals/js/approvals.config.js similarity index 92% rename from src/app/orders/orderApprovals/js/orderApprovals.config.js rename to src/app/myOrders/approvals/js/approvals.config.js index 6f6d6ea2..232a5e55 100644 --- a/src/app/orders/orderApprovals/js/orderApprovals.config.js +++ b/src/app/myOrders/approvals/js/approvals.config.js @@ -6,7 +6,7 @@ function ApprovalsConfig($stateProvider){ $stateProvider .state('orderDetail.approvals', { url: '/approvals', - templateUrl: 'orders/orderApprovals/templates/orderApprovals.html', + templateUrl: 'myOrders/approvals/templates/approvals.html', controller: 'OrderApprovalsCtrl', controllerAs: 'orderApprovals', data: { diff --git a/src/app/orders/orderApprovals/js/orderApprovals.controller.js b/src/app/myOrders/approvals/js/approvals.controller.js similarity index 100% rename from src/app/orders/orderApprovals/js/orderApprovals.controller.js rename to src/app/myOrders/approvals/js/approvals.controller.js diff --git a/src/app/orders/orderApprovals/js/oc-approvals.service.js b/src/app/myOrders/approvals/js/approvals.service.js similarity index 75% rename from src/app/orders/orderApprovals/js/oc-approvals.service.js rename to src/app/myOrders/approvals/js/approvals.service.js index 905fe660..f637acec 100644 --- a/src/app/orders/orderApprovals/js/oc-approvals.service.js +++ b/src/app/myOrders/approvals/js/approvals.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocApprovals', ocApprovals) ; -function ocApprovals(OrderCloud, $q, $uibModal, $state){ +function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ var service = { List: _list, UpdateApprovalStatus: _updateApprovalStatus @@ -11,14 +11,24 @@ function ocApprovals(OrderCloud, $q, $uibModal, $state){ function _list(orderID, buyerID, page, pageSize) { var deferred = $q.defer(); - OrderCloud.Orders.ListApprovals(orderID, null, page, pageSize, null, 'Status', null, buyerID) + var options = { + page: page, + pageSize: pageSize, + sortBy: 'Status' + }; + sdkOrderCloud.Orders.ListApprovals('outgoing', orderID, options) .then(function(data) { getApprovingUserGroups(data) }); function getApprovingUserGroups(data) { var userGroupIDs = _.uniq(_.pluck(data.Items, 'ApprovingGroupID')); - OrderCloud.UserGroups.List(null, 1, 100, null, null, {ID: userGroupIDs.join('|')}, buyerID) + var options = { + page: 1, + pageSize: 100, + filters: {ID: userGroupIDs.join('|')} + }; + sdkOrderCloud.UserGroups.List(buyerID, options) .then(function(userGroupList) { _.each(data.Items, function(approval) { approval.ApprovingUserGroup = _.findWhere(userGroupList.Items, {ID: approval.ApprovingGroupID}); @@ -32,7 +42,12 @@ function ocApprovals(OrderCloud, $q, $uibModal, $state){ function getApprovingUsers(data){ var userIDs = _.compact(_.uniq(_.pluck(data.Items, 'ApproverID'))); - OrderCloud.Users.List(null, null, 1, 100, null, null, {ID: userIDs.join('|')}, buyerID) + var options = { + page: 1, + pageSize: 100, + filters: {ID: userIDs.join('|')} + }; + sdkOrderCloud.Users.List(buyerID, options) .then(function(userList){ _.each(data.Items, function(approval){ if(approval.Status !== 'Pending') approval.ApprovingUser = _.findWhere(userList.Items, {ID: approval.ApproverID}); @@ -46,7 +61,12 @@ function ocApprovals(OrderCloud, $q, $uibModal, $state){ function getApprovalRules(data) { var approvalRuleIDs = _.pluck(data.Items, 'ApprovalRuleID'); - OrderCloud.ApprovalRules.List(null, 1, 100, null, null, {ID: approvalRuleIDs.join('|')}, buyerID) + var options = { + page: 1, + pageSize: 100, + filters: {ID: approvalRuleIDs.join('|')} + }; + sdkOrderCloud.ApprovalRules.List(buyerID, options) .then(function(approvalRuleData) { angular.forEach(data.Items, function(approval) { approval.ApprovalRule = _.findWhere(approvalRuleData.Items, {ID: approval.ApprovalRuleID}); diff --git a/src/app/orders/orderApprovals/templates/orderApprovals.html b/src/app/myOrders/approvals/templates/approvals.html similarity index 100% rename from src/app/orders/orderApprovals/templates/orderApprovals.html rename to src/app/myOrders/approvals/templates/approvals.html diff --git a/src/app/orders/orderApprovals/templates/approve.modal.html b/src/app/myOrders/approvals/templates/approve.modal.html similarity index 100% rename from src/app/orders/orderApprovals/templates/approve.modal.html rename to src/app/myOrders/approvals/templates/approve.modal.html diff --git a/src/app/orders/orderApprovals/tests/orderApprovals.spec.js b/src/app/myOrders/approvals/tests/orderApprovals.spec.js similarity index 100% rename from src/app/orders/orderApprovals/tests/orderApprovals.spec.js rename to src/app/myOrders/approvals/tests/orderApprovals.spec.js diff --git a/src/app/orders/myOrders.md b/src/app/myOrders/myOrders.md similarity index 100% rename from src/app/orders/myOrders.md rename to src/app/myOrders/myOrders.md diff --git a/src/app/orders/orderDetails/js/orderDetails.config.js b/src/app/myOrders/order/js/orderDetails.config.js similarity index 68% rename from src/app/orders/orderDetails/js/orderDetails.config.js rename to src/app/myOrders/order/js/orderDetails.config.js index dd48b1a2..37336a70 100644 --- a/src/app/orders/orderDetails/js/orderDetails.config.js +++ b/src/app/myOrders/order/js/orderDetails.config.js @@ -7,7 +7,7 @@ function OrderDetailConfig($stateProvider){ .state('orderDetail', { url: '/order/:orderid', parent: 'account', - templateUrl: 'orders/orderDetails/templates/orderDetails.html', + templateUrl: 'myOrders/order/templates/orderDetails.html', controller: 'OrderDetailsCtrl', controllerAs: 'orderDetails', data: { @@ -17,8 +17,8 @@ function OrderDetailConfig($stateProvider){ SelectedOrder: function($stateParams, ocOrderDetails){ return ocOrderDetails.Get($stateParams.orderid); }, - OrderLineItems: function($stateParams, OrderCloud){ - return OrderCloud.LineItems.List($stateParams.orderid, null, 1, null, null, null, null, $stateParams.buyerid); + OrderLineItems: function($stateParams, sdkOrderCloud){ + return sdkOrderCloud.LineItems.List('outgoing', $stateParams.orderid); } } }); diff --git a/src/app/orders/orderDetails/js/orderDetails.controller.js b/src/app/myOrders/order/js/orderDetails.controller.js similarity index 100% rename from src/app/orders/orderDetails/js/orderDetails.controller.js rename to src/app/myOrders/order/js/orderDetails.controller.js diff --git a/src/app/orders/orderDetails/js/oc-orderDetails.service.js b/src/app/myOrders/order/js/orderDetails.service.js similarity index 75% rename from src/app/orders/orderDetails/js/oc-orderDetails.service.js rename to src/app/myOrders/order/js/orderDetails.service.js index f03b0845..c0848de1 100644 --- a/src/app/orders/orderDetails/js/oc-orderDetails.service.js +++ b/src/app/myOrders/order/js/orderDetails.service.js @@ -2,19 +2,19 @@ angular.module('orderCloud') .factory('ocOrderDetails', ocOrderDetailsService) ; -function ocOrderDetailsService($q, $exceptionHandler, OrderCloud){ +function ocOrderDetailsService($q, $exceptionHandler, sdkOrderCloud){ var service = { Get: _get }; function _get(orderID){ - return OrderCloud.Orders.Get(orderID) + return sdkOrderCloud.Orders.Get('outgoing', orderID) .then(function(order){ return getBuyerOrg(order); }); function getBuyerOrg(order){ - return OrderCloud.Buyers.Get(order.FromCompanyID) + return sdkOrderCloud.Buyers.Get(order.FromCompanyID) .then(function(buyer){ order.FromCompany = buyer; return order; diff --git a/src/app/orders/orderDetails/templates/orderDetails.html b/src/app/myOrders/order/templates/orderDetails.html similarity index 98% rename from src/app/orders/orderDetails/templates/orderDetails.html rename to src/app/myOrders/order/templates/orderDetails.html index 4a9ca25b..c7d75a6c 100644 --- a/src/app/orders/orderDetails/templates/orderDetails.html +++ b/src/app/myOrders/order/templates/orderDetails.html @@ -37,7 +37,7 @@ <h3 class="l-page-header__title"> <b>Date {{orderDetails.order.DateSubmitted ? 'Submitted' : 'Created'}}: </b> {{(orderDetails.order.DateSubmitted || orderDetails.order.DateCreated) | date:'medium'}} <br> <b>Status: </b> {{orderDetails.order.Status | humanize}} <br> <b>Buyer Company: </b> {{orderDetails.order.FromCompany.Name}} <br> - <b>Created By: </b> {{orderDetails.order.FromUserFirstName + ' ' + orderDetails.order.FromUserLastName}} <br> + <b>Created By: </b> {{orderDetails.order.FromUser.FirstName + ' ' + orderDetails.order.FromUser.LastName}} <br> <div ng-if="orderDetails.order.Comments"> <b>Comments: </b> {{orderDetails.order.Comments}} </div> diff --git a/src/app/orders/orderDetails/tests/orderDetails.spec.js b/src/app/myOrders/order/tests/orderDetails.spec.js similarity index 100% rename from src/app/orders/orderDetails/tests/orderDetails.spec.js rename to src/app/myOrders/order/tests/orderDetails.spec.js diff --git a/src/app/orders/orderList/js/orders.config.js b/src/app/myOrders/orders/js/orders.config.js similarity index 91% rename from src/app/orders/orderList/js/orders.config.js rename to src/app/myOrders/orders/js/orders.config.js index 055e2c88..235218a1 100644 --- a/src/app/orders/orderList/js/orders.config.js +++ b/src/app/myOrders/orders/js/orders.config.js @@ -6,7 +6,7 @@ function OrdersConfig($stateProvider) { $stateProvider .state('orders', { parent: 'account', - templateUrl: 'orders/orderList/templates/orders.html', + templateUrl: 'myOrders/orders/templates/orders.html', controller: 'OrdersCtrl', controllerAs: 'orders', data: { diff --git a/src/app/orders/orderList/js/orders.controller.js b/src/app/myOrders/orders/js/orders.controller.js similarity index 94% rename from src/app/orders/orderList/js/orders.controller.js rename to src/app/myOrders/orders/js/orders.controller.js index 7be9d9a7..b642e93c 100644 --- a/src/app/orders/orderList/js/orders.controller.js +++ b/src/app/myOrders/orders/js/orders.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('OrdersCtrl', OrdersController) ; -function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, ocOrders, OrderList, Parameters) { +function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters, ocOrders, OrderList, Parameters) { var vm = this; vm.list = OrderList; vm.parameters = Parameters; @@ -110,7 +110,8 @@ function OrdersController($state, $filter, $ocMedia, OrderCloud, ocParameters, o } function loadMore() { - return ocOrders.List(vm.parameters) + var parameters = angular.extend(vm.parameters, {page:vm.list.Meta.Page + 1}); + return ocOrders.List(parameters) .then(function(data){ vm.list.Items = vm.list.Items.concat(data.Items); vm.list.Meta = data.Meta; diff --git a/src/app/orders/orderList/js/oc-orders.service.js b/src/app/myOrders/orders/js/orders.service.js similarity index 79% rename from src/app/orders/orderList/js/oc-orders.service.js rename to src/app/myOrders/orders/js/orders.service.js index f19024fd..76b15af1 100644 --- a/src/app/orders/orderList/js/oc-orders.service.js +++ b/src/app/myOrders/orders/js/orders.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrders', ocOrdersService) ; -function ocOrdersService(OrderCloud){ +function ocOrdersService(sdkOrderCloud){ var service = { List: _list }; @@ -11,7 +11,7 @@ function ocOrdersService(OrderCloud){ var parameters = angular.copy(Parameters); //exclude unsubmitted orders from list - parameters.filters = {Status: '!Unsubmitted'}; + //parameters.filters = {Status: '!Unsubmitted'}; //TODO: Uncomment this line when API ! is fixed //set outgoing params to iso8601 format as expected by api //set returning params to date object as expected by uib-datepicker @@ -45,9 +45,13 @@ function ocOrdersService(OrderCloud){ angular.extend(parameters.filters, {Status: parameters.status}); } - // list orders with generated parameters - var listType = parameters.tab === 'approvals' ? 'ListIncomingOrders' : 'ListOutgoingOrders'; - return OrderCloud.Me[listType](parameters.search, parameters.page, parameters.pageSize || 12, parameters.searchOn, parameters.sortBy, parameters.filters); + parameters.pageSize = parameters.pageSize ? parameters.pageSize : 12; + + if (parameters.tab == 'approvals') { + return sdkOrderCloud.Me.ListApprovableOrders(parameters); + } else { + return sdkOrderCloud.Me.ListOrders(parameters); + } } return service; diff --git a/src/app/orders/orderList/templates/orders.html b/src/app/myOrders/orders/templates/orders.html similarity index 100% rename from src/app/orders/orderList/templates/orders.html rename to src/app/myOrders/orders/templates/orders.html diff --git a/src/app/orders/orderList/tests/orders.spec.js b/src/app/myOrders/orders/tests/orders.spec.js similarity index 100% rename from src/app/orders/orderList/tests/orders.spec.js rename to src/app/myOrders/orders/tests/orders.spec.js From b730ab2f79bfd84478bfc6c682b79d95be4b8774 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 12:48:54 -0500 Subject: [PATCH 055/158] Base directory structure refactor --- src/app/base/base.js | 128 ---------------------------- src/app/base/js/base.config.js | 51 +++++++++++ src/app/base/js/base.controller.js | 30 +++++++ src/app/base/js/newOrder.service.js | 51 +++++++++++ 4 files changed, 132 insertions(+), 128 deletions(-) delete mode 100644 src/app/base/base.js create mode 100644 src/app/base/js/base.config.js create mode 100644 src/app/base/js/base.controller.js create mode 100644 src/app/base/js/newOrder.service.js diff --git a/src/app/base/base.js b/src/app/base/base.js deleted file mode 100644 index 5067052f..00000000 --- a/src/app/base/base.js +++ /dev/null @@ -1,128 +0,0 @@ -angular.module('orderCloud') - .config(BaseConfig) - .controller('BaseCtrl', BaseController) - .factory('NewOrder', NewOrderService) -; - -function BaseConfig($stateProvider) { - $stateProvider.state('base', { - url: '', - abstract: true, - views: { - '': { - templateUrl: 'base/templates/base.tpl.html', - controller: 'BaseCtrl', - controllerAs: 'base' - }, - 'nav@base': { - 'templateUrl': 'base/templates/navigation.tpl.html' - } - }, - resolve: { - CurrentUser: function($q, $state, OrderCloud, sdkOrderCloud, buyerid) { - return sdkOrderCloud.Me.Get() - .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); //TODO: remove this line after refactor is complete - return data; - }) - }, - ExistingOrder: function($q, sdkOrderCloud, CurrentUser) { - var options = { - page: 1, - pageSize: 1, - sortBy: '!DateCreated', - filters: {Status: 'Unsubmitted'} - }; - return sdkOrderCloud.Me.ListOrders(options) - .then(function(data) { - return data.Items[0]; - }); - }, - CurrentOrder: function(ExistingOrder, NewOrder, CurrentUser) { - if (!ExistingOrder) { - return NewOrder.Create({}); - } else { - return ExistingOrder; - } - }, - AnonymousUser: function($q, sdkOrderCloud, CurrentUser) { - CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(sdkOrderCloud.GetToken().split('.')[1])).orderid); - } - } - }); -} - -function BaseController($rootScope, $state, sdkOrderCloud, ProductSearch, CurrentUser, CurrentOrder) { - var vm = this; - vm.currentUser = CurrentUser; - vm.currentOrder = CurrentOrder; - - vm.mobileSearch = function() { - ProductSearch.Open() - .then(function(data) { - if (data.productID) { - $state.go('productDetail', {productid: data.productID}); - } else { - $state.go('productSearchResults', {searchTerm: data.searchTerm}); - } - }); - }; - - $rootScope.$on('OC:UpdateOrder', function(event, OrderID, message) { - vm.orderLoading = { - message: message - }; - vm.orderLoading.promise = sdkOrderCloud.Orders.Get('outgoing', OrderID) - .then(function(data) { - vm.currentOrder = data; - }); - }); -} - -function NewOrderService($q, sdkOrderCloud) { - var service = { - Create: _create - }; - - function _create() { - var deferred = $q.defer(); - var order = {}; - - //ShippingAddressID - var options = { - page: 1, - pageSize: 100, - filters: {Shipping: true} - }; - sdkOrderCloud.Me.ListAddresses(options) - .then(function(shippingAddresses) { - if (shippingAddresses.Items.length) order.ShippingAddressID = shippingAddresses.Items[0].ID; - setBillingAddress(); - }); - - //BillingAddressID - function setBillingAddress() { - var options = { - page: 1, - pageSize: 100, - filters: {Billing: true} - }; - sdkOrderCloud.Me.ListAddresses(options) - .then(function(billingAddresses) { - if (billingAddresses.Items.length) order.BillingAddressID = billingAddresses.Items[0].ID; - createOrder(); - }); - } - - function createOrder() { - sdkOrderCloud.Orders.Create('outgoing', order) - .then(function(order) { - deferred.resolve(order); - }); - } - - return deferred.promise; - } - - return service; -} \ No newline at end of file diff --git a/src/app/base/js/base.config.js b/src/app/base/js/base.config.js new file mode 100644 index 00000000..989a3125 --- /dev/null +++ b/src/app/base/js/base.config.js @@ -0,0 +1,51 @@ +angular.module('orderCloud') + .config(BaseConfig) +; + +function BaseConfig($stateProvider) { + $stateProvider.state('base', { + url: '', + abstract: true, + views: { + '': { + templateUrl: 'base/templates/base.tpl.html', + controller: 'BaseCtrl', + controllerAs: 'base' + }, + 'nav@base': { + 'templateUrl': 'base/templates/navigation.tpl.html' + } + }, + resolve: { + CurrentUser: function($q, $state, OrderCloud, sdkOrderCloud, buyerid) { + return sdkOrderCloud.Me.Get() + .then(function(data) { + OrderCloud.BuyerID.Set(buyerid); //TODO: remove this line after refactor is complete + return data; + }) + }, + ExistingOrder: function($q, sdkOrderCloud, CurrentUser) { + var options = { + page: 1, + pageSize: 1, + sortBy: '!DateCreated', + filters: {Status: 'Unsubmitted'} + }; + return sdkOrderCloud.Me.ListOrders(options) + .then(function(data) { + return data.Items[0]; + }); + }, + CurrentOrder: function(ExistingOrder, ocNewOrder, CurrentUser) { + if (!ExistingOrder) { + return ocNewOrder.Create({}); + } else { + return ExistingOrder; + } + }, + AnonymousUser: function($q, sdkOrderCloud, CurrentUser) { + CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(sdkOrderCloud.GetToken().split('.')[1])).orderid); + } + } + }); +} \ No newline at end of file diff --git a/src/app/base/js/base.controller.js b/src/app/base/js/base.controller.js new file mode 100644 index 00000000..6b8808c0 --- /dev/null +++ b/src/app/base/js/base.controller.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .controller('BaseCtrl', BaseController) +; + +function BaseController($rootScope, $state, sdkOrderCloud, ProductSearch, CurrentUser, CurrentOrder) { + var vm = this; + vm.currentUser = CurrentUser; + vm.currentOrder = CurrentOrder; + + vm.mobileSearch = function() { + ProductSearch.Open() + .then(function(data) { + if (data.productID) { + $state.go('productDetail', {productid: data.productID}); + } else { + $state.go('productSearchResults', {searchTerm: data.searchTerm}); + } + }); + }; + + $rootScope.$on('OC:UpdateOrder', function(event, OrderID, message) { + vm.orderLoading = { + message: message + }; + vm.orderLoading.promise = sdkOrderCloud.Orders.Get('outgoing', OrderID) + .then(function(data) { + vm.currentOrder = data; + }); + }); +} \ No newline at end of file diff --git a/src/app/base/js/newOrder.service.js b/src/app/base/js/newOrder.service.js new file mode 100644 index 00000000..7051e791 --- /dev/null +++ b/src/app/base/js/newOrder.service.js @@ -0,0 +1,51 @@ +angular.module('orderCloud') + .factory('ocNewOrder', OrderCloudNewOrderService) +; + +function OrderCloudNewOrderService($q, sdkOrderCloud) { + var service = { + Create: _create + }; + + function _create() { + var deferred = $q.defer(); + var order = {}; + + //ShippingAddressID + var options = { + page: 1, + pageSize: 100, + filters: {Shipping: true} + }; + sdkOrderCloud.Me.ListAddresses(options) + .then(function(shippingAddresses) { + if (shippingAddresses.Items.length) order.ShippingAddressID = shippingAddresses.Items[0].ID; + setBillingAddress(); + }); + + //BillingAddressID + function setBillingAddress() { + var options = { + page: 1, + pageSize: 100, + filters: {Billing: true} + }; + sdkOrderCloud.Me.ListAddresses(options) + .then(function(billingAddresses) { + if (billingAddresses.Items.length) order.BillingAddressID = billingAddresses.Items[0].ID; + createOrder(); + }); + } + + function createOrder() { + sdkOrderCloud.Orders.Create('outgoing', order) + .then(function(order) { + deferred.resolve(order); + }); + } + + return deferred.promise; + } + + return service; +} \ No newline at end of file From c62185ec184ec901cf46f7d3a119b21841624db4 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:04:08 -0500 Subject: [PATCH 056/158] Home and Base structure refactor --- src/app/base/js/base.config.js | 4 ++-- src/app/base/templates/{base.tpl.html => base.html} | 0 .../templates/{navigation.tpl.html => navigation.html} | 0 src/app/home/{home.js => js/home.config.js} | 9 ++------- src/app/home/js/home.controller.js | 7 +++++++ src/app/home/templates/{home.tpl.html => home.html} | 0 6 files changed, 11 insertions(+), 9 deletions(-) rename src/app/base/templates/{base.tpl.html => base.html} (100%) rename src/app/base/templates/{navigation.tpl.html => navigation.html} (100%) rename src/app/home/{home.js => js/home.config.js} (65%) create mode 100644 src/app/home/js/home.controller.js rename src/app/home/templates/{home.tpl.html => home.html} (100%) diff --git a/src/app/base/js/base.config.js b/src/app/base/js/base.config.js index 989a3125..ebffad6d 100644 --- a/src/app/base/js/base.config.js +++ b/src/app/base/js/base.config.js @@ -8,12 +8,12 @@ function BaseConfig($stateProvider) { abstract: true, views: { '': { - templateUrl: 'base/templates/base.tpl.html', + templateUrl: 'base/templates/base.html', controller: 'BaseCtrl', controllerAs: 'base' }, 'nav@base': { - 'templateUrl': 'base/templates/navigation.tpl.html' + 'templateUrl': 'base/templates/navigation.html' } }, resolve: { diff --git a/src/app/base/templates/base.tpl.html b/src/app/base/templates/base.html similarity index 100% rename from src/app/base/templates/base.tpl.html rename to src/app/base/templates/base.html diff --git a/src/app/base/templates/navigation.tpl.html b/src/app/base/templates/navigation.html similarity index 100% rename from src/app/base/templates/navigation.tpl.html rename to src/app/base/templates/navigation.html diff --git a/src/app/home/home.js b/src/app/home/js/home.config.js similarity index 65% rename from src/app/home/home.js rename to src/app/home/js/home.config.js index cc54af25..76ad8e18 100644 --- a/src/app/home/home.js +++ b/src/app/home/js/home.config.js @@ -1,6 +1,5 @@ angular.module('orderCloud') .config(HomeConfig) - .controller('HomeCtrl', HomeController) ; function HomeConfig($stateProvider) { @@ -8,7 +7,7 @@ function HomeConfig($stateProvider) { .state('home', { parent: 'base', url: '/home', - templateUrl: 'home/templates/home.tpl.html', + templateUrl: 'home/templates/home.html', controller: 'HomeCtrl', controllerAs: 'home', data: { @@ -16,8 +15,4 @@ function HomeConfig($stateProvider) { } }) ; -} - -function HomeController() { - var vm = this; -} +} \ No newline at end of file diff --git a/src/app/home/js/home.controller.js b/src/app/home/js/home.controller.js new file mode 100644 index 00000000..2ad0818d --- /dev/null +++ b/src/app/home/js/home.controller.js @@ -0,0 +1,7 @@ +angular.module('orderCloud') + .controller('HomeCtrl', HomeController) +; + +function HomeController() { + var vm = this; +} \ No newline at end of file diff --git a/src/app/home/templates/home.tpl.html b/src/app/home/templates/home.html similarity index 100% rename from src/app/home/templates/home.tpl.html rename to src/app/home/templates/home.html From 6e05b928873b074b5c23458c7c0a205f6c5aaf8b Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:28:01 -0500 Subject: [PATCH 057/158] SDK Update: Product Browse and refactor directory structure --- .../oc-prevent-click/oc-prevent-click.js | 13 + .../common/templates/card.product.tpl.html | 2 +- .../productBrowse/js/productBrowse.config.js | 72 ++++++ .../js/productBrowse.controller.js | 66 +++++ .../productBrowse/js/productBrowse.service.js | 27 ++ ...ctBrowseMobileCategory.modal.controller.js | 16 ++ .../js/productBrowseProductView.controller.js | 67 +++++ src/app/productBrowse/productBrowse.js | 230 ------------------ ...dal.tpl.html => mobileCategory.modal.html} | 0 ...ductBrowse.tpl.html => productBrowse.html} | 0 ...{productView.tpl.html => productView.html} | 0 11 files changed, 262 insertions(+), 231 deletions(-) create mode 100644 src/app/common/directives/oc-prevent-click/oc-prevent-click.js create mode 100644 src/app/productBrowse/js/productBrowse.config.js create mode 100644 src/app/productBrowse/js/productBrowse.controller.js create mode 100644 src/app/productBrowse/js/productBrowse.service.js create mode 100644 src/app/productBrowse/js/productBrowseMobileCategory.modal.controller.js create mode 100644 src/app/productBrowse/js/productBrowseProductView.controller.js delete mode 100644 src/app/productBrowse/productBrowse.js rename src/app/productBrowse/templates/{mobileCategory.modal.tpl.html => mobileCategory.modal.html} (100%) rename src/app/productBrowse/templates/{productBrowse.tpl.html => productBrowse.html} (100%) rename src/app/productBrowse/templates/{productView.tpl.html => productView.html} (100%) diff --git a/src/app/common/directives/oc-prevent-click/oc-prevent-click.js b/src/app/common/directives/oc-prevent-click/oc-prevent-click.js new file mode 100644 index 00000000..d99cff1c --- /dev/null +++ b/src/app/common/directives/oc-prevent-click/oc-prevent-click.js @@ -0,0 +1,13 @@ +angular.module('orderCloud') + .directive('ocPreventClick', OrderCloudPreventClickDirective) +; + +function OrderCloudPreventClickDirective(){ + return { + link: function($scope, element) { + element.on("click", function(e){ + e.stopPropagation(); + }); + } + }; +} \ No newline at end of file diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.tpl.html index bcdc2824..d499ed60 100644 --- a/src/app/common/templates/card.product.tpl.html +++ b/src/app/common/templates/card.product.tpl.html @@ -9,7 +9,7 @@ <h4 class="c-product-card__name" ng-class="">{{product.Name || product.ID}}</h4> <div class="c-product-card__descrip hidden-xs" ng-if="product.Description" > <p>{{product.Description | limitTo: 40}}{{product.Description.length > 40 ? '...' : ''}}</p> </div> - <div class="text-right c-product-card__icons hidden-xs" prevent-click> + <div class="text-right c-product-card__icons hidden-xs" oc-prevent-click> <ordercloud-product-quick-view product="product" current-order="base.currentOrder"></ordercloud-product-quick-view> <ordercloud-favorite-product product="product" current-user="base.currentUser"></ordercloud-favorite-product> </div> diff --git a/src/app/productBrowse/js/productBrowse.config.js b/src/app/productBrowse/js/productBrowse.config.js new file mode 100644 index 00000000..7876e1ff --- /dev/null +++ b/src/app/productBrowse/js/productBrowse.config.js @@ -0,0 +1,72 @@ +angular.module('orderCloud') + .config(ProductBrowseConfig) +; + +function ProductBrowseConfig($urlRouterProvider, $stateProvider) { + $urlRouterProvider.when('/browse', '/browse/products'); + $stateProvider + .state('productBrowse', { + abstract: true, + parent: 'base', + url: '/browse', + templateUrl: 'productBrowse/templates/productBrowse.html', + controller: 'ProductBrowseCtrl', + controllerAs: 'productBrowse', + data: { + pageTitle: 'Browse Products' + }, + resolve: { + Parameters: function ($stateParams, ocParameters) { + return ocParameters.Get($stateParams); + }, + CategoryList: function(sdkOrderCloud, catalogid) { + var parameters = { + depth: 'all', + catalogID: catalogid, + page: 1, + pageSize: 100 + }; + return sdkOrderCloud.Me.ListCategories(parameters); + }, + CategoryTree: function(CategoryList) { + var result = []; + angular.forEach(_.where(CategoryList.Items, {ParentID: null}), function(node) { + result.push(getnode(node)); + }); + function getnode(node) { + var children = _.where(CategoryList.Items, {ParentID: node.ID}); + if (children.length > 0) { + node.children = children; + angular.forEach(children, function(child) { + return getnode(child); + }); + } else { + node.children = []; + } + return node; + } + return result; + } + } + }) + .state('productBrowse.products', { + url: '/products?categoryid?favorites?search?page?pageSize?searchOn?sortBy?filters?depth', + templateUrl: 'productBrowse/templates/productView.html', + controller: 'ProductViewCtrl', + controllerAs: 'productView', + resolve: { + Parameters: function ($stateParams, ocParameters) { + return ocParameters.Get($stateParams); + }, + ProductList: function(sdkOrderCloud, CurrentUser, Parameters, catalogid) { + if (Parameters.favorites && CurrentUser.xp.FavoriteProducts) { + Parameters.filters ? angular.extend(Parameters.filters, Parameters.filters, {ID:CurrentUser.xp.FavoriteProducts.join('|')}) : Parameters.filters = {ID:CurrentUser.xp.FavoriteProducts.join('|')}; + } else if (Parameters.filters) { + delete Parameters.filters.ID; + } + var parameters = angular.extend(Parameters, {catalogID: catalogid, filters: {categoryid: Parameters.categoryid}}); + return sdkOrderCloud.Me.ListProducts(parameters); + } + } + }); +} \ No newline at end of file diff --git a/src/app/productBrowse/js/productBrowse.controller.js b/src/app/productBrowse/js/productBrowse.controller.js new file mode 100644 index 00000000..82e640d7 --- /dev/null +++ b/src/app/productBrowse/js/productBrowse.controller.js @@ -0,0 +1,66 @@ +angular.module('orderCloud') + .controller('ProductBrowseCtrl', ProductBrowseController) +; + +function ProductBrowseController($state, ocProductBrowse, CategoryList, CategoryTree, Parameters) { + var vm = this; + vm.parameters = Parameters; + vm.categoryList = CategoryList; + + //Category Tree Setup + vm.treeConfig = {}; + + vm.treeConfig.treeData = CategoryTree; + vm.treeConfig.treeOptions = { + equality: function(node1, node2) { + if (node2 && node1) { + return node1.ID === node2.ID; + } else { + return node1 === node2; + } + } + }; + + vm.treeConfig.selectNode = function(node) { + $state.go('productBrowse.products', {categoryid:node.ID, page:''}); + }; + + //Initiate breadcrumbs is triggered by product list view (child state "productBrowse.products") + vm.treeConfig.initBreadcrumbs = function(activeCategoryID, ignoreSetNode) { + if (!ignoreSetNode) { //first iteration of initBreadcrumbs(), initiate breadcrumb array, set selected node for tree + vm.treeConfig.selectedNode = {ID:activeCategoryID}; + vm.breadcrumb = []; + } + if (!activeCategoryID) { //at the catalog root, no expanded nodes + vm.treeConfig.expandedNodes = angular.copy(vm.breadcrumb); + } else { + var activeCategory = _.findWhere(vm.categoryList.Items, {ID: activeCategoryID}); + if (activeCategory) { + vm.breadcrumb.unshift(activeCategory); + if (activeCategory.ParentID) { + vm.treeConfig.initBreadcrumbs(activeCategory.ParentID, true); + } else { //last iteration, set tree expanded nodes to the breadcrumb + vm.treeConfig.expandedNodes = angular.copy(vm.breadcrumb); + } + } + } + }; + + 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 = ''; + } + $state.go('productBrowse.products', vm.parameters); + }; + + vm.openCategoryModal = function(){ + ocProductBrowse.OpenCategoryModal(vm.treeConfig) + .then(function(node){ + $state.go('productBrowse.products', {categoryid:node.ID, page:''}); + }); + }; +} \ No newline at end of file diff --git a/src/app/productBrowse/js/productBrowse.service.js b/src/app/productBrowse/js/productBrowse.service.js new file mode 100644 index 00000000..815c7821 --- /dev/null +++ b/src/app/productBrowse/js/productBrowse.service.js @@ -0,0 +1,27 @@ +angular.module('orderCloud') + .factory('ocProductBrowse', OrderCloudProductBrowseService) +; + +function OrderCloudProductBrowseService($uibModal) { + var service = { + OpenCategoryModal: _openCategoryModal + }; + + function _openCategoryModal(treeConfig) { + return $uibModal.open({ + animation: true, + backdrop:'static', + templateUrl: 'productBrowse/templates/mobileCategory.modal.html', + controller: 'MobileCategoryModalCtrl', + controllerAs: 'mobileCategoryModal', + size: '-full-screen', + resolve: { + TreeConfig: function () { + return treeConfig; + } + } + }).result; + } + + return service; +} \ No newline at end of file diff --git a/src/app/productBrowse/js/productBrowseMobileCategory.modal.controller.js b/src/app/productBrowse/js/productBrowseMobileCategory.modal.controller.js new file mode 100644 index 00000000..e64914cd --- /dev/null +++ b/src/app/productBrowse/js/productBrowseMobileCategory.modal.controller.js @@ -0,0 +1,16 @@ +angular.module('orderCloud') + .controller('MobileCategoryModalCtrl', MobileCategoryModalController) +; + +function MobileCategoryModalController($uibModalInstance, TreeConfig){ + var vm = this; + vm.treeConfig = TreeConfig; + + vm.cancel = function() { + $uibModalInstance.dismiss(); + }; + + vm.selectNode = function(node){ + $uibModalInstance.close(node); + }; +} \ No newline at end of file diff --git a/src/app/productBrowse/js/productBrowseProductView.controller.js b/src/app/productBrowse/js/productBrowseProductView.controller.js new file mode 100644 index 00000000..b1afa913 --- /dev/null +++ b/src/app/productBrowse/js/productBrowseProductView.controller.js @@ -0,0 +1,67 @@ +angular.module('orderCloud') + .controller('ProductViewCtrl', ProductViewController) +; + +function ProductViewController($state, $ocMedia, ocParameters, sdkOrderCloud, CurrentOrder, ProductList, CategoryList, Parameters){ + var vm = this; + vm.parameters = Parameters; + vm.categories = CategoryList; + vm.list = ProductList; + + vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; + + //Filtering and Search Functionality + //check if filters are applied + vm.filtersApplied = vm.parameters.filters || ($ocMedia('max-width: 767px') && vm.sortSelection); + vm.showFilters = vm.filtersApplied; + + + //reload the state with new filters + vm.filter = function(resetPage) { + $state.go('.', ocParameters.Create(vm.parameters, resetPage)); + }; + + //clear the relevant filters, reload the state & reset the page + vm.clearFilters = function() { + vm.parameters.filters = null; + $ocMedia('max-width: 767px') ? vm.parameters.sortBy = null : angular.noop(); + vm.filter(true); + }; + + 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.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() { + $state.go('.', { + page: vm.list.Meta.Page + }); + }; + + //load the next page of results with all the same parameters + vm.loadMore = function() { + var parameters = angular.extend(Parameters, {page: vm.list.Meta.Page + 1}); + return sdkOrderCloud.Me.ListProducts(parameters) + .then(function(data) { + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + }; +} \ No newline at end of file diff --git a/src/app/productBrowse/productBrowse.js b/src/app/productBrowse/productBrowse.js deleted file mode 100644 index c9905b8f..00000000 --- a/src/app/productBrowse/productBrowse.js +++ /dev/null @@ -1,230 +0,0 @@ -angular.module('orderCloud') - .config(ProductBrowseConfig) - .controller('ProductBrowseCtrl', ProductBrowseController) - .controller('ProductViewCtrl', ProductViewController) - .directive('preventClick', PreventClick) - .controller('MobileCategoryModalCtrl', MobileCategoryModalController) -; - -function ProductBrowseConfig($urlRouterProvider, $stateProvider) { - $urlRouterProvider.when('/browse', '/browse/products'); - $stateProvider - .state('productBrowse', { - abstract: true, - parent: 'base', - url: '/browse', - templateUrl: 'productBrowse/templates/productBrowse.tpl.html', - controller: 'ProductBrowseCtrl', - controllerAs: 'productBrowse', - data: { - pageTitle: 'Browse Products' - }, - resolve: { - Parameters: function ($stateParams, ocParameters) { - return ocParameters.Get($stateParams); - }, - CategoryList: function(OrderCloud) { - return OrderCloud.Me.ListCategories(null, 1, 100, null, null, null, 'all'); - }, - CategoryTree: function(CategoryList) { - var result = []; - angular.forEach(_.where(CategoryList.Items, {ParentID: null}), function(node) { - result.push(getnode(node)); - }); - function getnode(node) { - var children = _.where(CategoryList.Items, {ParentID: node.ID}); - if (children.length > 0) { - node.children = children; - angular.forEach(children, function(child) { - return getnode(child); - }); - } else { - node.children = []; - } - return node; - } - return result; - } - } - }) - .state('productBrowse.products', { - url: '/products?categoryid?favorites?search?page?pageSize?searchOn?sortBy?filters?depth', - templateUrl: 'productBrowse/templates/productView.tpl.html', - controller: 'ProductViewCtrl', - controllerAs: 'productView', - resolve: { - Parameters: function ($stateParams, ocParameters) { - return ocParameters.Get($stateParams); - }, - ProductList: function(OrderCloud, CurrentUser, Parameters) { - if (Parameters.favorites && CurrentUser.xp.FavoriteProducts) { - Parameters.filters ? angular.extend(Parameters.filters, Parameters.filters, {ID:CurrentUser.xp.FavoriteProducts.join('|')}) : Parameters.filters = {ID:CurrentUser.xp.FavoriteProducts.join('|')}; - } else if (Parameters.filters) { - delete Parameters.filters.ID; - } - return OrderCloud.Me.ListProducts(Parameters.search, Parameters.page, Parameters.pageSize, Parameters.searchOn, Parameters.sortBy, Parameters.filters, Parameters.categoryid); - } - } - }); -} - -function ProductBrowseController($state, $uibModal, CategoryList, CategoryTree, Parameters) { - var vm = this; - vm.parameters = Parameters; - vm.categoryList = CategoryList; - - //Category Tree Setup - vm.treeConfig = {}; - - vm.treeConfig.treeData = CategoryTree; - vm.treeConfig.treeOptions = { - equality: function(node1, node2) { - if (node2 && node1) { - return node1.ID === node2.ID; - } else { - return node1 === node2; - } - } - }; - - vm.treeConfig.selectNode = function(node) { - $state.go('productBrowse.products', {categoryid:node.ID, page:''}); - }; - - //Initiate breadcrumbs is triggered by product list view (child state "productBrowse.products") - vm.treeConfig.initBreadcrumbs = function(activeCategoryID, ignoreSetNode) { - if (!ignoreSetNode) { //first iteration of initBreadcrumbs(), initiate breadcrumb array, set selected node for tree - vm.treeConfig.selectedNode = {ID:activeCategoryID}; - vm.breadcrumb = []; - } - if (!activeCategoryID) { //at the catalog root, no expanded nodes - vm.treeConfig.expandedNodes = angular.copy(vm.breadcrumb); - } else { - var activeCategory = _.findWhere(vm.categoryList.Items, {ID: activeCategoryID}); - if (activeCategory) { - vm.breadcrumb.unshift(activeCategory); - if (activeCategory.ParentID) { - vm.treeConfig.initBreadcrumbs(activeCategory.ParentID, true); - } else { //last iteration, set tree expanded nodes to the breadcrumb - vm.treeConfig.expandedNodes = angular.copy(vm.breadcrumb); - } - } - } - }; - - 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 = ''; - } - $state.go('productBrowse.products', vm.parameters); - }; - - vm.openCategoryModal = function(){ - $uibModal.open({ - animation: true, - backdrop:'static', - templateUrl: 'productBrowse/templates/mobileCategory.modal.tpl.html', - controller: 'MobileCategoryModalCtrl', - controllerAs: 'mobileCategoryModal', - size: '-full-screen', - resolve: { - TreeConfig: function () { - return vm.treeConfig; - } - } - }) - .result.then(function(node){ - $state.go('productBrowse.products', {categoryid:node.ID, page:''}); - }); - }; -} - -function ProductViewController($state, $ocMedia, ocParameters, OrderCloud, CurrentOrder, ProductList, CategoryList, Parameters){ - var vm = this; - vm.parameters = Parameters; - vm.categories = CategoryList; - vm.list = ProductList; - - vm.sortSelection = Parameters.sortBy ? (Parameters.sortBy.indexOf('!') == 0 ? Parameters.sortBy.split('!')[1] : Parameters.sortBy) : null; - - //Filtering and Search Functionality - //check if filters are applied - vm.filtersApplied = vm.parameters.filters || ($ocMedia('max-width: 767px') && vm.sortSelection); - vm.showFilters = vm.filtersApplied; - - - //reload the state with new filters - vm.filter = function(resetPage) { - $state.go('.', ocParameters.Create(vm.parameters, resetPage)); - }; - - //clear the relevant filters, reload the state & reset the page - vm.clearFilters = function() { - vm.parameters.filters = null; - $ocMedia('max-width: 767px') ? vm.parameters.sortBy = null : angular.noop(); - vm.filter(true); - }; - - 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.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() { - $state.go('.', { - page: vm.list.Meta.Page - }); - }; - - //load the next page of results with all the same parameters - vm.loadMore = function() { - return OrderCloud.Me.ListProducts(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 PreventClick(){ - return { - link: function($scope, element) { - element.on("click", function(e){ - e.stopPropagation(); - }); - } - }; -} - -function MobileCategoryModalController($uibModalInstance, TreeConfig){ - var vm = this; - vm.treeConfig = TreeConfig; - - vm.cancel = function() { - $uibModalInstance.dismiss(); - }; - - vm.selectNode = function(node){ - $uibModalInstance.close(node); - }; -} \ No newline at end of file diff --git a/src/app/productBrowse/templates/mobileCategory.modal.tpl.html b/src/app/productBrowse/templates/mobileCategory.modal.html similarity index 100% rename from src/app/productBrowse/templates/mobileCategory.modal.tpl.html rename to src/app/productBrowse/templates/mobileCategory.modal.html diff --git a/src/app/productBrowse/templates/productBrowse.tpl.html b/src/app/productBrowse/templates/productBrowse.html similarity index 100% rename from src/app/productBrowse/templates/productBrowse.tpl.html rename to src/app/productBrowse/templates/productBrowse.html diff --git a/src/app/productBrowse/templates/productView.tpl.html b/src/app/productBrowse/templates/productView.html similarity index 100% rename from src/app/productBrowse/templates/productView.tpl.html rename to src/app/productBrowse/templates/productView.html From 01b8a752b183d978f7b1b323fa1ab5ab31897a9c Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:41:16 -0500 Subject: [PATCH 058/158] SDK Update: Product Detail and directory structure --- .../productDetail/js/productDetail.config.js | 19 ++++++++ .../productDetail.controller.js} | 21 +------- .../productDetail/js/specForm.directive.js | 31 ++++++++++++ .../js/specSelectField.directive.js | 24 ++++++++++ src/app/productDetail/specForm/specForms.js | 48 ------------------- ...ductDetail.tpl.html => productDetail.html} | 0 .../specForm.html} | 2 +- .../specSelectField.html} | 0 8 files changed, 76 insertions(+), 69 deletions(-) create mode 100644 src/app/productDetail/js/productDetail.config.js rename src/app/productDetail/{productDetail.js => js/productDetail.controller.js} (60%) create mode 100644 src/app/productDetail/js/specForm.directive.js create mode 100644 src/app/productDetail/js/specSelectField.directive.js delete mode 100644 src/app/productDetail/specForm/specForms.js rename src/app/productDetail/templates/{productDetail.tpl.html => productDetail.html} (100%) rename src/app/productDetail/{specForm/templates/specForm.tpl.html => templates/specForm.html} (90%) rename src/app/productDetail/{specForm/templates/specSelectionField.tpl.html => templates/specSelectField.html} (100%) diff --git a/src/app/productDetail/js/productDetail.config.js b/src/app/productDetail/js/productDetail.config.js new file mode 100644 index 00000000..c4d4b215 --- /dev/null +++ b/src/app/productDetail/js/productDetail.config.js @@ -0,0 +1,19 @@ +angular.module('orderCloud') + .config(ProductDetailConfig) +; + +function ProductDetailConfig($stateProvider) { + $stateProvider + .state('productDetail', { + parent: 'base', + url: '/product/:productid', + templateUrl: 'productDetail/templates/productDetail.html', + controller: 'ProductDetailCtrl', + controllerAs: 'productDetail', + resolve: { + Product: function ($stateParams, sdkOrderCloud, catalogid) { + return sdkOrderCloud.Me.GetProduct(catalogid, $stateParams.productid); + } + } + }); +} \ No newline at end of file diff --git a/src/app/productDetail/productDetail.js b/src/app/productDetail/js/productDetail.controller.js similarity index 60% rename from src/app/productDetail/productDetail.js rename to src/app/productDetail/js/productDetail.controller.js index 16b0cf99..8277f93b 100644 --- a/src/app/productDetail/productDetail.js +++ b/src/app/productDetail/js/productDetail.controller.js @@ -1,25 +1,7 @@ angular.module('orderCloud') - .config(ProductConfig) .controller('ProductDetailCtrl', ProductDetailController) ; -function ProductConfig($stateProvider) { - $stateProvider - .state('productDetail', { - parent: 'base', - url: '/product/:productid', - templateUrl: 'productDetail/templates/productDetail.tpl.html', - controller: 'ProductDetailCtrl', - controllerAs: 'productDetail', - resolve: { - Product: function ($stateParams, OrderCloud) { - return OrderCloud.Me.GetProduct($stateParams.productid); - } - } - }); -} - - function ProductDetailController($exceptionHandler, Product, CurrentOrder, ocLineItems, toastr) { var vm = this; vm.item = Product; @@ -43,5 +25,4 @@ function ProductDetailController($exceptionHandler, Product, CurrentOrder, ocLin return vm.finalPriceBreak.Price * qty; }; -} - +} \ No newline at end of file diff --git a/src/app/productDetail/js/specForm.directive.js b/src/app/productDetail/js/specForm.directive.js new file mode 100644 index 00000000..867b19c7 --- /dev/null +++ b/src/app/productDetail/js/specForm.directive.js @@ -0,0 +1,31 @@ +angular.module('orderCloud') + .directive('ocSpecForm', OrderCloudSpecFormDirective) +; + +function OrderCloudSpecFormDirective(sdkOrderCloud, catalogid) { + return { + scope: { + product: '=' + }, + templateUrl: 'productDetail/templates/specForm.html', + replace: true, + link: function(scope){ + if (scope.product.SpecCount > 0) { + var options = { + page: 1, + pageSize: 100 + }; + sdkOrderCloud.Me.ListSpecs(catalogid, scope.product.ID, options) + .then(function(data){ + //go through specs array if there is a default value, set the specValue = default value + angular.forEach(data.Items, function(obj, key){ + obj.DefaultValue && (obj.AllowOpenText == false) ? obj.Value = obj.DefaultValue : angular.noop(); + }); + scope.product.Specs=data.Items; + }); + } else { + return null; + } + } + } +} \ No newline at end of file diff --git a/src/app/productDetail/js/specSelectField.directive.js b/src/app/productDetail/js/specSelectField.directive.js new file mode 100644 index 00000000..6ff5b046 --- /dev/null +++ b/src/app/productDetail/js/specSelectField.directive.js @@ -0,0 +1,24 @@ +angular.module('orderCloud') + .directive('ocSpecSelectField', OrderCloudSpecSelectFieldDirective) +; + +// this directive makes it so that when an option selected , it checks that option selected to see if it has an openFieldText so that an input will appear so user can enter value. +function OrderCloudSpecSelectFieldDirective() { + return { + scope: { + spec: '=' + }, + templateUrl: 'productDetail/templates/specSelectField.html', + link: function(scope) { + if(scope.spec.DefaultOptionID) scope.spec.OptionID = scope.spec.DefaultOptionID; + scope.showField = false; + scope.$watch(function() { + return scope.spec.OptionID; + }, function(newVal, oldVal) { + if (!newVal) return; + var selectedOption = _.findWhere(scope.spec.Options, {ID : newVal}); + scope.showField= selectedOption.IsOpenText; + }); + } + }; +} \ No newline at end of file diff --git a/src/app/productDetail/specForm/specForms.js b/src/app/productDetail/specForm/specForms.js deleted file mode 100644 index aca82879..00000000 --- a/src/app/productDetail/specForm/specForms.js +++ /dev/null @@ -1,48 +0,0 @@ -angular.module('orderCloud') - .directive('ocSpecForm', OCSpecForm) - .directive('specSelectField', SpecSelectionDirective) -; - -function OCSpecForm(OrderCloud) { - return { - scope: { - product: '=' - }, - templateUrl: 'productDetail/specForm/templates/specForm.tpl.html', - replace: true, - link: function(scope){ - if (scope.product.SpecCount > 0) { - OrderCloud.Me.ListSpecs(scope.product.ID, null, 1, 100) - .then(function(data){ - //go through specs array if there is a default value, set the specValue = default value - angular.forEach(data.Items, function(obj, key){ - obj.DefaultValue && (obj.AllowOpenText == false) ? obj.Value = obj.DefaultValue : angular.noop(); - }); - scope.product.Specs=data.Items; - }); - } else { - return null; - } - } - } -} -// this directive makes it so that when an option selected , it checks that option selected to see if it has an openFieldText so that an input will appear so user can enter value. -function SpecSelectionDirective() { - return { - scope: { - spec: '=' - }, - templateUrl: 'productDetail/specForm/templates/specSelectionField.tpl.html', - link: function(scope) { - if(scope.spec.DefaultOptionID) scope.spec.OptionID = scope.spec.DefaultOptionID; - scope.showField = false; - scope.$watch(function() { - return scope.spec.OptionID; - }, function(newVal, oldVal) { - if (!newVal) return; - var selectedOption = _.findWhere(scope.spec.Options, {ID : newVal}); - scope.showField= selectedOption.IsOpenText; - }); - } - }; -} \ No newline at end of file diff --git a/src/app/productDetail/templates/productDetail.tpl.html b/src/app/productDetail/templates/productDetail.html similarity index 100% rename from src/app/productDetail/templates/productDetail.tpl.html rename to src/app/productDetail/templates/productDetail.html diff --git a/src/app/productDetail/specForm/templates/specForm.tpl.html b/src/app/productDetail/templates/specForm.html similarity index 90% rename from src/app/productDetail/specForm/templates/specForm.tpl.html rename to src/app/productDetail/templates/specForm.html index e2bcc1b8..8af60bc4 100644 --- a/src/app/productDetail/specForm/templates/specForm.tpl.html +++ b/src/app/productDetail/templates/specForm.html @@ -10,6 +10,6 @@ </fieldset> <fieldset ng-if="spec.Options.length > 0"> <label for="{{spec.ID}}">{{spec.Name || spec.ID}}</label> - <spec-select-field spec="spec"></spec-select-field> + <oc-spec-select-field spec="spec"></oc-spec-select-field> </fieldset> </div> diff --git a/src/app/productDetail/specForm/templates/specSelectionField.tpl.html b/src/app/productDetail/templates/specSelectField.html similarity index 100% rename from src/app/productDetail/specForm/templates/specSelectionField.tpl.html rename to src/app/productDetail/templates/specSelectField.html From 9c15e1beb7de46216b7fb75cfe4aa41f0ddfd440 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:58:27 -0500 Subject: [PATCH 059/158] Change Buyer port to avoid conflict with Admin --- gulp/serve.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulp/serve.js b/gulp/serve.js index 17b50ee6..5644f273 100644 --- a/gulp/serve.js +++ b/gulp/serve.js @@ -7,7 +7,7 @@ styles = require('./build/styles'), cache = require('gulp-cached'), browserSync = require('browser-sync').create('oc-server'), - port = process.env.PORT || 7203; + port = process.env.PORT || 7205; function startBrowerSync () { if (browserSync.active) { From 07c7bb4ceb60e50e25b3987873b2ab0c329720f4 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:58:46 -0500 Subject: [PATCH 060/158] Invalid token was not sending user to login --- src/app/base/js/base.config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/base/js/base.config.js b/src/app/base/js/base.config.js index ebffad6d..f3ec8774 100644 --- a/src/app/base/js/base.config.js +++ b/src/app/base/js/base.config.js @@ -23,6 +23,9 @@ function BaseConfig($stateProvider) { OrderCloud.BuyerID.Set(buyerid); //TODO: remove this line after refactor is complete return data; }) + .catch(function(ex) { + $state.go('login'); + }) }, ExistingOrder: function($q, sdkOrderCloud, CurrentUser) { var options = { From fce2ad9196953864d5464fbed80e30bc45578abb Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 13:59:08 -0500 Subject: [PATCH 061/158] SDK Update: Product Detail and StandardPriceSchedule => PriceSchedule --- .../oc-quantity-input/oc-quantity-input.html | 20 +++++++++--------- .../services/oc-lineitems/oc-lineitems.js | 4 ++-- .../common/templates/card.product.tpl.html | 2 +- .../js/productDetail.controller.js | 2 +- .../templates/productDetail.html | 21 ++++++++++++------- .../productDetail/test/productView.spec.js | 4 ++-- src/app/productQuickView/productQuickView.js | 2 +- .../templates/productQuickView.modal.tpl.html | 4 ++-- 8 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/app/common/directives/oc-quantity-input/oc-quantity-input.html b/src/app/common/directives/oc-quantity-input/oc-quantity-input.html index e6cefd8d..e3bf6754 100644 --- a/src/app/common/directives/oc-quantity-input/oc-quantity-input.html +++ b/src/app/common/directives/oc-quantity-input/oc-quantity-input.html @@ -5,19 +5,19 @@ name="itemQuantity" type="number" ng-required="true" - ng-if="!item.StandardPriceSchedule.RestrictedQuantity" + ng-if="!item.PriceSchedule.RestrictedQuantity" class="form-control text-center" - ng-min="{{item.StandardPriceSchedule.MinQuantity}}" - ng-max="{{item.StandardPriceSchedule.MaxQuantity}}" + ng-min="{{item.PriceSchedule.MinQuantity}}" + ng-max="{{item.PriceSchedule.MaxQuantity}}" ng-model="item.Quantity" placeholder="Quantity"> <select id="itemQuantity" name="itemQuantity" ng-required="true" - ng-if="item.StandardPriceSchedule.RestrictedQuantity" + ng-if="item.PriceSchedule.RestrictedQuantity" class="form-control text-center" ng-model="item.Quantity" - ng-options="priceBreak.Quantity as priceBreak.Quantity for priceBreak in item.StandardPriceSchedule.PriceBreaks"></select> + ng-options="priceBreak.Quantity as priceBreak.Quantity for priceBreak in item.PriceSchedule.PriceBreaks"></select> <small class="help-block" ng-if="item.QuantityMultiplier > 1"> {{'Quantity multiplier x ' + item.QuantityMultiplier + (item.Quantity ? (' (' + (item.Quantity * item.QuantityMultiplier) + ')') : '')}} </small> @@ -28,10 +28,10 @@ name="itemQuantity" type="number" ng-required="true" - ng-if="!item.Product.StandardPriceSchedule.RestrictedQuantity" + ng-if="!item.Product.PriceSchedule.RestrictedQuantity" class="form-control text-center" - ng-min="{{item.Product.StandardPriceSchedule.MinQuantity}}" - ng-max="{{item.Product.StandardPriceSchedule.MaxQuantity}}" + ng-min="{{item.Product.PriceSchedule.MinQuantity}}" + ng-max="{{item.Product.PriceSchedule.MaxQuantity}}" ng-model="item.Quantity" ng-model-options="{ debounce: 1000 }" ng-change="updateQuantity()" @@ -39,11 +39,11 @@ <select id="itemQuantity" name="itemQuantity" ng-required="true" - ng-if="item.Product.StandardPriceSchedule.RestrictedQuantity" + ng-if="item.Product.PriceSchedule.RestrictedQuantity" class="form-control" ng-model="item.Quantity" ng-change="updateQuantity()" - ng-options="priceBreak.Quantity as priceBreak.Quantity for priceBreak in item.Product.StandardPriceSchedule.PriceBreaks"></select> + ng-options="priceBreak.Quantity as priceBreak.Quantity for priceBreak in item.Product.PriceSchedule.PriceBreaks"></select> <small class="help-block" ng-if="item.Product.QuantityMultiplier > 1"> {{'x ' + item.Product.QuantityMultiplier + (item.Quantity ? (' (' + (item.Quantity * item.Product.QuantityMultiplier) + ')') : '')}} </small> diff --git a/src/app/common/services/oc-lineitems/oc-lineitems.js b/src/app/common/services/oc-lineitems/oc-lineitems.js index a4ea15f3..14e48fa6 100644 --- a/src/app/common/services/oc-lineitems/oc-lineitems.js +++ b/src/app/common/services/oc-lineitems/oc-lineitems.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocLineItems', LineItemFactory) ; -function LineItemFactory($rootScope, $q, $uibModal, OrderCloud) { +function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { return { SpecConvert: _specConvert, AddItem: _addItem, @@ -44,7 +44,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud) { Specs: _specConvert(product.Specs) }; li.ShippingAddressID = isSingleShipping(order) ? getSingleShippingAddressID(order) : null; - OrderCloud.LineItems.Create(order.ID, li) + sdkOrderCloud.LineItems.Create('outgoing', order.ID, li) .then(function(lineItem) { $rootScope.$broadcast('OC:UpdateOrder', order.ID); deferred.resolve(); diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.tpl.html index d499ed60..10b80df7 100644 --- a/src/app/common/templates/card.product.tpl.html +++ b/src/app/common/templates/card.product.tpl.html @@ -3,7 +3,7 @@ <div class="caption c-product-card__body"> <div class="c-product-card__info clearfix"> <span class="pull-left c-product-card__id" ng-if="product.Name">{{product.ID | limitTo: 8}}{{product.ID.length > 8 ? '...' : ''}}</span> - <span class="pull-right c-product-card__price"><b class="text-primary">{{product.StandardPriceSchedule.PriceBreaks[0].Price | currency}}</b> <small class="text-muted">x {{product.StandardPriceSchedule.PriceBreaks[0].Quantity}}</small></span> + <span class="pull-right c-product-card__price"><b class="text-primary">{{product.PriceSchedule.PriceBreaks[0].Price | currency}}</b> <small class="text-muted">x {{product.PriceSchedule.PriceBreaks[0].Quantity}}</small></span> </div> <h4 class="c-product-card__name" ng-class="">{{product.Name || product.ID}}</h4> <div class="c-product-card__descrip hidden-xs" ng-if="product.Description" > diff --git a/src/app/productDetail/js/productDetail.controller.js b/src/app/productDetail/js/productDetail.controller.js index 8277f93b..ddb2fe90 100644 --- a/src/app/productDetail/js/productDetail.controller.js +++ b/src/app/productDetail/js/productDetail.controller.js @@ -18,7 +18,7 @@ function ProductDetailController($exceptionHandler, Product, CurrentOrder, ocLin }; vm.findPrice = function(qty){ - angular.forEach(vm.item.StandardPriceSchedule.PriceBreaks, function(priceBreak) { + angular.forEach(vm.item.PriceSchedule.PriceBreaks, function(priceBreak) { if (priceBreak.Quantity <= qty) vm.finalPriceBreak = angular.copy(priceBreak); }); diff --git a/src/app/productDetail/templates/productDetail.html b/src/app/productDetail/templates/productDetail.html index e4ea813b..d9e64f99 100644 --- a/src/app/productDetail/templates/productDetail.html +++ b/src/app/productDetail/templates/productDetail.html @@ -20,7 +20,7 @@ <h3 class="panel-title">Description</h3> {{productDetail.item.Description}} </div> </div> - <div class="panel panel-default" ng-if="productDetail.item.StandardPriceSchedule.PriceBreaks"> + <div class="panel panel-default" ng-if="productDetail.item.PriceSchedule.PriceBreaks"> <div class="panel-heading"> <h3 class="panel-title">Price Breaks</h3> </div> @@ -32,7 +32,7 @@ <h3 class="panel-title">Price Breaks</h3> </tr> </thead> <tbody> - <tr ng-repeat="priceBreak in productDetail.item.StandardPriceSchedule.PriceBreaks"> + <tr ng-repeat="priceBreak in productDetail.item.PriceSchedule.PriceBreaks"> <td>{{priceBreak.Quantity}}</td> <td>{{priceBreak.Price | currency}}</td> </tr> @@ -40,12 +40,17 @@ <h3 class="panel-title">Price Breaks</h3> </table> </div> <oc-spec-form product="productDetail.item"></oc-spec-form> - <fieldset class="form-group"> - <oc-quantity-input product="productDetail.item" label="Quantity"></oc-quantity-input> - </fieldset> - <fieldset class="form-group"> - <button type="submit" class="btn btn-block btn-success">Add to Cart <span ng-if="productDetail.item.Quantity" class="badge badge-success">{{productDetail.findPrice(productDetail.item.Quantity) | currency}}</span></button> - </fieldset> + <div ng-if="productDetail.item.PriceSchedule"> + <fieldset class="form-group"> + <oc-quantity-input product="productDetail.item" label="Quantity"></oc-quantity-input> + </fieldset> + <fieldset class="form-group"> + <button type="submit" class="btn btn-block btn-success">Add to Cart <span ng-if="productDetail.item.Quantity" class="badge badge-success">{{productDetail.findPrice(productDetail.item.Quantity) | currency}}</span></button> + </fieldset> + </div> + <div class="alert alert-danger" ng-if="!productDetail.item.PriceSchedule"> + You are not able to order this product. + </div> </div> </div> </form> \ No newline at end of file diff --git a/src/app/productDetail/test/productView.spec.js b/src/app/productDetail/test/productView.spec.js index 6b647679..00fe28e6 100644 --- a/src/app/productDetail/test/productView.spec.js +++ b/src/app/productDetail/test/productView.spec.js @@ -21,7 +21,7 @@ describe('Component: ProductDetail', function(){ "ID": "MockProductID123", "Name": "MockProductName", "Description": "mockDescription", - "StandardPriceSchedule": { + "PriceSchedule": { "PriceBreaks" : [ { "Quantity": 2, @@ -95,7 +95,7 @@ describe('Component: ProductDetail', function(){ var possibleQuantities= [2]; for(var i = 0; i <possibleQuantities.length; i++){ productDetailCtrl.findPrice(possibleQuantities[i]); - expect(productDetailCtrl.finalPriceBreak.Price).toBe( mockProduct.StandardPriceSchedule.PriceBreaks[i].Price ); + expect(productDetailCtrl.finalPriceBreak.Price).toBe( mockProduct.PriceSchedule.PriceBreaks[i].Price ); } }) diff --git a/src/app/productQuickView/productQuickView.js b/src/app/productQuickView/productQuickView.js index 258bcfc4..c477cb72 100644 --- a/src/app/productQuickView/productQuickView.js +++ b/src/app/productQuickView/productQuickView.js @@ -55,7 +55,7 @@ function ProductQuickViewController(toastr, $uibModalInstance, SelectedProduct, vm.findPrice = function(qty){ var finalPriceBreak = null; - angular.forEach(vm.item.StandardPriceSchedule.PriceBreaks, function(priceBreak) { + angular.forEach(vm.item.PriceSchedule.PriceBreaks, function(priceBreak) { if (priceBreak.Quantity <= qty) finalPriceBreak = angular.copy(priceBreak); }); diff --git a/src/app/productQuickView/templates/productQuickView.modal.tpl.html b/src/app/productQuickView/templates/productQuickView.modal.tpl.html index 3370735a..7c2651d3 100644 --- a/src/app/productQuickView/templates/productQuickView.modal.tpl.html +++ b/src/app/productQuickView/templates/productQuickView.modal.tpl.html @@ -21,7 +21,7 @@ <h3 class="panel-title">Description</h3> {{productQuickView.item.Description}} </div> </div> - <div class="panel panel-default" ng-if="productQuickView.item.StandardPriceSchedule.PriceBreaks"> + <div class="panel panel-default" ng-if="productQuickView.item.PriceSchedule.PriceBreaks"> <div class="panel-heading"> <h3 class="panel-title">Price Breaks</h3> </div> @@ -33,7 +33,7 @@ <h3 class="panel-title">Price Breaks</h3> </tr> </thead> <tbody> - <tr ng-repeat="priceBreak in productQuickView.item.StandardPriceSchedule.PriceBreaks"> + <tr ng-repeat="priceBreak in productQuickView.item.PriceSchedule.PriceBreaks"> <td>{{priceBreak.Quantity}}</td> <td>{{priceBreak.Price}}</td> </tr> From 7ff74c14171aaf4d5e94d61c45dae25787913867 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 14:21:42 -0500 Subject: [PATCH 062/158] SDK Update: Category Browse and refactor directory structure --- src/app/categoryBrowse/categoryBrowse.js | 75 ------------------- .../js/categoryBrowse.config.js | 51 +++++++++++++ .../js/categoryBrowse.controller.js | 52 +++++++++++++ ...oryBrowse.tpl.html => categoryBrowse.html} | 15 +++- 4 files changed, 117 insertions(+), 76 deletions(-) delete mode 100644 src/app/categoryBrowse/categoryBrowse.js create mode 100644 src/app/categoryBrowse/js/categoryBrowse.config.js create mode 100644 src/app/categoryBrowse/js/categoryBrowse.controller.js rename src/app/categoryBrowse/templates/{categoryBrowse.tpl.html => categoryBrowse.html} (80%) diff --git a/src/app/categoryBrowse/categoryBrowse.js b/src/app/categoryBrowse/categoryBrowse.js deleted file mode 100644 index b9f33471..00000000 --- a/src/app/categoryBrowse/categoryBrowse.js +++ /dev/null @@ -1,75 +0,0 @@ -angular.module('orderCloud') - .config(CategoryBrowseConfig) - .controller('CategoryBrowseCtrl', CategoryBrowseController) -; - -function CategoryBrowseConfig($stateProvider, catalogid){ - $stateProvider - .state('categoryBrowse', { - parent:'base', - url:'/browse/categories?categoryID?productPage?categoryPage?pageSize?sortBy?filters', - templateUrl:'categoryBrowse/templates/categoryBrowse.tpl.html', - controller:'CategoryBrowseCtrl', - controllerAs:'categoryBrowse', - resolve: { - Parameters: function($stateParams, ocParameters) { - return ocParameters.Get($stateParams); - }, - CategoryList: function(OrderCloud, Parameters) { - if(Parameters.categoryID) { Parameters.filters ? Parameters.filters.ParentID = Parameters.categoryID : Parameters.filters = {ParentID:Parameters.categoryID}; } - return OrderCloud.Me.ListCategories(null, Parameters.categoryPage, Parameters.pageSize || 12, null, Parameters.sortBy, Parameters.filters, 1); - }, - ProductList: function(OrderCloud, Parameters) { - if(Parameters && Parameters.filters && Parameters.filters.ParentID) { - delete Parameters.filters.ParentID; - return OrderCloud.Me.ListProducts(null, Parameters.productPage, Parameters.pageSize || 12, null, Parameters.sortBy, Parameters.filters, Parameters.categoryID); - } else { - return null; - } - }, - SelectedCategory: function(OrderCloud, Parameters){ - if(Parameters.categoryID){ - return OrderCloud.Me.ListCategories(null, 1, 1, null, null, {ID:Parameters.categoryID}, 'all') - .then(function(data){ - return data.Items[0]; - }); - - } else { - return null; - } - - } - } - }); -} - -function CategoryBrowseController($state, ocParameters, CategoryList, ProductList, Parameters, SelectedCategory) { - var vm = this; - vm.categoryList = CategoryList; - vm.productList = ProductList; - vm.parameters = Parameters; - vm.selectedCategory = SelectedCategory; - - vm.getNumberOfResults = function(list){ - return vm[list].Meta.ItemRange[0] + ' - ' + vm[list].Meta.ItemRange[1] + ' of ' + vm[list].Meta.TotalCount + ' results'; - }; - - vm.filter = function(resetPage) { - $state.go('.', ocParameters.Create(vm.parameters, resetPage)); - }; - - vm.updateCategoryList = function(category){ - vm.parameters.categoryID = category; - vm.filter(true); - }; - - vm.changeCategoryPage = function(newPage){ - vm.parameters.categoryPage = newPage; - vm.filter(false); - }; - - vm.changeProductPage = function(newPage){ - vm.parameters.productPage = newPage; - vm.filter(false); - }; -} diff --git a/src/app/categoryBrowse/js/categoryBrowse.config.js b/src/app/categoryBrowse/js/categoryBrowse.config.js new file mode 100644 index 00000000..60a1659d --- /dev/null +++ b/src/app/categoryBrowse/js/categoryBrowse.config.js @@ -0,0 +1,51 @@ +angular.module('orderCloud') + .config(CategoryBrowseConfig) +; + +function CategoryBrowseConfig($stateProvider, catalogid){ + $stateProvider + .state('categoryBrowse', { + parent:'base', + url:'/browse/categories?categoryID?productPage?categoryPage?pageSize?sortBy?filters', + templateUrl:'categoryBrowse/templates/categoryBrowse.html', + controller:'CategoryBrowseCtrl', + controllerAs:'categoryBrowse', + resolve: { + Parameters: function($stateParams, ocParameters) { + return ocParameters.Get($stateParams); + }, + CategoryList: function(sdkOrderCloud, Parameters, catalogid) { + if(Parameters.categoryID) { Parameters.filters ? Parameters.filters.ParentID = Parameters.categoryID : Parameters.filters = {ParentID:Parameters.categoryID}; } + var parameters = angular.extend(Parameters, {depth: 1, page: (Parameters.categoryPage || Parameters.page), pageSize: (Parameters.pageSize || 12), catalogID: catalogid}); + return sdkOrderCloud.Me.ListCategories(parameters); + }, + ProductList: function(sdkOrderCloud, Parameters, catalogid) { + if(Parameters && Parameters.filters && Parameters.filters.ParentID) { + delete Parameters.filters.ParentID; + var parameters = angular.extend(Parameters, {catalogID: catalogid, page: (Parameters.productPage || Parameters.page), pageSize: (Parameters.pageSize || 12)}); + return sdkOrderCloud.Me.ListProducts(parameters); + } else { + return null; + } + }, + SelectedCategory: function(sdkOrderCloud, Parameters){ + if(Parameters.categoryID){ + var parameters = { + page: 1, + pageSize: 1, + depth: 'all', + filters: {ID: Parameters.categoryID} + }; + return sdkOrderCloud.Me.ListCategories(parameters) + .then(function(data){ + return data.Items[0]; + }); + + } else { + return null; + } + + } + } + }); +} \ No newline at end of file diff --git a/src/app/categoryBrowse/js/categoryBrowse.controller.js b/src/app/categoryBrowse/js/categoryBrowse.controller.js new file mode 100644 index 00000000..a7f54625 --- /dev/null +++ b/src/app/categoryBrowse/js/categoryBrowse.controller.js @@ -0,0 +1,52 @@ +angular.module('orderCloud') + .controller('CategoryBrowseCtrl', CategoryBrowseController) +; + +function CategoryBrowseController($state, sdkOrderCloud, ocParameters, CategoryList, ProductList, Parameters, SelectedCategory) { + var vm = this; + vm.categoryList = CategoryList; + vm.productList = ProductList; + vm.parameters = Parameters; + vm.selectedCategory = SelectedCategory; + + vm.getNumberOfResults = function(list){ + return vm[list].Meta.ItemRange[0] + ' - ' + vm[list].Meta.ItemRange[1] + ' of ' + vm[list].Meta.TotalCount + ' results'; + }; + + vm.filter = function(resetPage) { + $state.go('.', ocParameters.Create(vm.parameters, resetPage)); + }; + + vm.updateCategoryList = function(category){ + vm.parameters.categoryID = category; + vm.filter(true); + }; + + vm.changeCategoryPage = function(newPage){ + vm.parameters.categoryPage = newPage; + vm.filter(false); + }; + + vm.loadMoreCategories = function() { + var parameters = angular.extend(Parameters, {page:vm.categoryList.Meta.Page + 1}); + return sdkOrderCloud.Me.ListCategories(parameters) + .then(function(data) { + vm.categoryList.Items = vm.categoryList.Items.concat(data.Items); + vm.categoryList.Meta = data.Meta; + }); + }; + + vm.changeProductPage = function(newPage){ + vm.parameters.productPage = newPage; + vm.filter(false); + }; + + vm.loadMoreProducts = function() { + var parameters = angular.extend(Parameters, {page:vm.productList.Meta.Page + 1}); + return sdkOrderCloud.Me.ListProducts(parameters) + .then(function(data) { + vm.productList.Items = vm.productList.Items.concat(data.Items); + vm.productList.Meta = data.Meta; + }); + }; +} \ No newline at end of file diff --git a/src/app/categoryBrowse/templates/categoryBrowse.tpl.html b/src/app/categoryBrowse/templates/categoryBrowse.html similarity index 80% rename from src/app/categoryBrowse/templates/categoryBrowse.tpl.html rename to src/app/categoryBrowse/templates/categoryBrowse.html index 5ff76499..1131da36 100644 --- a/src/app/categoryBrowse/templates/categoryBrowse.tpl.html +++ b/src/app/categoryBrowse/templates/categoryBrowse.html @@ -17,6 +17,7 @@ <h3 class="c-category-card__title">{{category.Name || category.ID}}</h3> </div> <!-- Category List Pagination --> <uib-pagination + class="pagination-sm pull-right hidden-xs" boundary-links="categoryBrowse.categoryList.Meta.TotalPages > 5" max-size="5" total-items="categoryBrowse.categoryList.Meta.TotalCount" items-per-page="categoryBrowse.categoryList.Meta.PageSize" @@ -24,6 +25,11 @@ <h3 class="c-category-card__title">{{category.Name || category.ID}}</h3> ng-change="categoryBrowse.changeCategoryPage(categoryBrowse.categoryList.Meta.Page)" ng-if="categoryBrowse.categoryList.Meta.TotalPages > 1"> </uib-pagination> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="categoryBrowse.categoryList.Meta.Page < categoryBrowse.categoryList.Meta.TotalPages" + ng-click="categoryBrowse.loadMoreCategories()">Load More Categories</button> + <!-- Product List --> <div ng-if="categoryBrowse.productList.Items.length"> <h3 class="page-header">{{categoryBrowse.productList.Items.length > 1 ? 'Products' : 'Product'}}</h3> @@ -35,15 +41,22 @@ <h3 class="page-header">{{categoryBrowse.productList.Items.length > 1 ? 'Product </div> </div> </div> + <!-- Product List Pagination --> <uib-pagination + class="pagination-sm pull-right hidden-xs" boundary-links="categoryBrowse.productList.Meta.TotalPages > 5" max-size="5" total-items="categoryBrowse.productList.Meta.TotalCount" items-per-page="categoryBrowse.productList.Meta.PageSize" ng-model="categoryBrowse.productList.Meta.Page" ng-change="categoryBrowse.changeProductPage(categoryBrowse.productList.Meta.Page)" - ng-if="categoryBrowse.categoryList.Meta.TotalPages > 1"> + ng-if="categoryBrowse.productList.Meta.TotalPages > 1"> </uib-pagination> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="categoryBrowse.productList.Meta.Page < categoryBrowse.productList.Meta.TotalPages" + ng-click="categoryBrowse.loadMoreProducts()">Load More Products</button> + <!-- No Results --> <div ng-if="!categoryBrowse.productList.Items.length && !categoryBrowse.categoryList.Items.length"> <div class="page-header"> From ee853ae68f02bd51b111e79cfc649ded92893ea2 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:03:23 -0500 Subject: [PATCH 063/158] SDK Update: Error Handling --- src/app/common/config/error-handling/error-handling.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/common/config/error-handling/error-handling.js b/src/app/common/config/error-handling/error-handling.js index ddf2ff83..5af35efe 100644 --- a/src/app/common/config/error-handling/error-handling.js +++ b/src/app/common/config/error-handling/error-handling.js @@ -19,7 +19,11 @@ angular.module('orderCloud') //TODO: this was changed to include the below if statement on 2/7/2017 - this change could cause unknown issues if (ex) { $delegate(ex, cause); - $injector.get('toastr').error(ex.data ? (ex.data.error || (ex.data.Errors ? ex.data.Errors[0].Message : ex.data)) : ex.message, 'Error'); + var message = (ex.response && ex.response.body && ex.response.body.Errors && ex.response.body.Errors.length) ? + ex.response.body.Errors[0].Message : + ex.message; + + $injector.get('toastr').error(message, 'Error'); } }; } From 44676faced23646ab192aaa2c4197d5e409529bc Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:05:52 -0500 Subject: [PATCH 064/158] SDK Update: Cart and refactor directory structure --- src/app/addPromotion/addPromotion.js | 4 +- src/app/cart/cart.js | 92 ------------------- src/app/cart/js/cart.config.js | 42 +++++++++ src/app/cart/js/cart.controller.js | 52 +++++++++++ .../templates/{cart.tpl.html => cart.html} | 0 .../{minicart.tpl.html => minicart.html} | 0 ...alMinicart.tpl.html => modalMinicart.html} | 0 .../services/oc-lineitems/oc-lineitems.js | 21 +++-- 8 files changed, 109 insertions(+), 102 deletions(-) delete mode 100644 src/app/cart/cart.js create mode 100644 src/app/cart/js/cart.config.js create mode 100644 src/app/cart/js/cart.controller.js rename src/app/cart/templates/{cart.tpl.html => cart.html} (100%) rename src/app/cart/templates/{minicart.tpl.html => minicart.html} (100%) rename src/app/cart/templates/{modalMinicart.tpl.html => modalMinicart.html} (100%) diff --git a/src/app/addPromotion/addPromotion.js b/src/app/addPromotion/addPromotion.js index 1afffa8c..050109fa 100644 --- a/src/app/addPromotion/addPromotion.js +++ b/src/app/addPromotion/addPromotion.js @@ -7,9 +7,9 @@ angular.module('orderCloud') controller: AddPromotionComponentCtrl }); -function AddPromotionComponentCtrl($exceptionHandler, $rootScope, OrderCloud, toastr) { +function AddPromotionComponentCtrl($exceptionHandler, $rootScope, sdkOrderCloud, toastr) { this.submit = function(orderID, promoCode) { - OrderCloud.Orders.AddPromotion(orderID, promoCode) + sdkOrderCloud.Orders.AddPromotion('outgoing', orderID, promoCode) .then(function(promo) { $rootScope.$broadcast('OC:UpdatePromotions', orderID); $rootScope.$broadcast('OC:UpdateOrder', orderID); diff --git a/src/app/cart/cart.js b/src/app/cart/cart.js deleted file mode 100644 index e3289939..00000000 --- a/src/app/cart/cart.js +++ /dev/null @@ -1,92 +0,0 @@ -angular.module('orderCloud') - .config(CartConfig) - .controller('CartCtrl', CartController) -; - -function CartConfig($stateProvider) { - $stateProvider - .state('cart', { - parent: 'base', - url: '/cart', - templateUrl: 'cart/templates/cart.tpl.html', - controller: 'CartCtrl', - controllerAs: 'cart', - data: { - pageTitle: "Shopping Cart" - }, - resolve: { - LineItemsList: function($q, $state, toastr, OrderCloud, ocLineItems, CurrentOrder) { - var dfd = $q.defer(); - OrderCloud.LineItems.List(CurrentOrder.ID) - .then(function(data) { - if (!data.Items.length) { - dfd.resolve(data); - } - else { - ocLineItems.GetProductInfo(data.Items) - .then(function() { - dfd.resolve(data); - }); - } - }) - .catch(function() { - toastr.error('Your order does not contain any line items.', 'Error'); - dfd.reject(); - }); - return dfd.promise; - }, - CurrentPromotions: function(CurrentOrder, OrderCloud) { - return OrderCloud.Orders.ListPromotions(CurrentOrder.ID); - } - } - }); -} - -function CartController($rootScope, $state, toastr, OrderCloud, LineItemsList, CurrentPromotions, ocConfirm) { - var vm = this; - vm.lineItems = LineItemsList; - vm.promotions = CurrentPromotions.Meta ? CurrentPromotions.Items : CurrentPromotions; - vm.removeItem = function(order, scope) { - vm.lineLoading = []; - vm.lineLoading[scope.$index] = OrderCloud.LineItems.Delete(order.ID, scope.lineItem.ID) - .then(function () { - $rootScope.$broadcast('OC:UpdateOrder', order.ID); - vm.lineItems.Items.splice(scope.$index, 1); - toastr.success('Line Item Removed'); - }); - }; - - //TODO: missing unit tests - vm.removePromotion = function(order, scope) { - OrderCloud.Orders.RemovePromotion(order.ID, scope.promotion.Code) - .then(function() { - $rootScope.$broadcast('OC:UpdateOrder', order.ID); - vm.promotions.splice(scope.$index, 1); - }); - }; - - vm.cancelOrder = function(order){ - ocConfirm.Confirm({ - message:'Are you sure you want to cancel this order?', - confirmText: 'Yes, cancel order', - type: 'delete'}) - .then(function() { - OrderCloud.Orders.Delete(order.ID) - .then(function(){ - $state.go("home",{}, {reload:'base'}) - }); - }); - }; - - //TODO: missing unit tests - $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { - OrderCloud.Orders.ListPromotions(orderid) - .then(function(data) { - if (data.Meta) { - vm.promotions = data.Items; - } else { - vm.promotions = data; - } - }); - }); -} diff --git a/src/app/cart/js/cart.config.js b/src/app/cart/js/cart.config.js new file mode 100644 index 00000000..2800d5b3 --- /dev/null +++ b/src/app/cart/js/cart.config.js @@ -0,0 +1,42 @@ +angular.module('orderCloud') + .config(CartConfig) +; + +function CartConfig($stateProvider) { + $stateProvider + .state('cart', { + parent: 'base', + url: '/cart', + templateUrl: 'cart/templates/cart.html', + controller: 'CartCtrl', + controllerAs: 'cart', + data: { + pageTitle: "Shopping Cart" + }, + resolve: { + LineItemsList: function($q, $state, toastr, sdkOrderCloud, ocLineItems, CurrentOrder) { + var dfd = $q.defer(); + sdkOrderCloud.LineItems.List('outgoing', CurrentOrder.ID) + .then(function(data) { + if (!data.Items.length) { + dfd.resolve(data); + } + else { + ocLineItems.GetProductInfo(data.Items) + .then(function() { + dfd.resolve(data); + }); + } + }) + .catch(function() { + toastr.error('Your order does not contain any line items.', 'Error'); + dfd.reject(); + }); + return dfd.promise; + }, + CurrentPromotions: function(CurrentOrder, sdkOrderCloud) { + return sdkOrderCloud.Orders.ListPromotions('outgoing', CurrentOrder.ID); + } + } + }); +} \ No newline at end of file diff --git a/src/app/cart/js/cart.controller.js b/src/app/cart/js/cart.controller.js new file mode 100644 index 00000000..5a7da4e4 --- /dev/null +++ b/src/app/cart/js/cart.controller.js @@ -0,0 +1,52 @@ +angular.module('orderCloud') + .controller('CartCtrl', CartController) +; + +function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList, CurrentPromotions, ocConfirm) { + var vm = this; + vm.lineItems = LineItemsList; + vm.promotions = CurrentPromotions.Meta ? CurrentPromotions.Items : CurrentPromotions; + vm.removeItem = function(order, scope) { + vm.lineLoading = []; + vm.lineLoading[scope.$index] = OrderCloud.LineItems.Delete(order.ID, scope.lineItem.ID) + .then(function () { + $rootScope.$broadcast('OC:UpdateOrder', order.ID); + vm.lineItems.Items.splice(scope.$index, 1); + toastr.success('Line Item Removed'); + }); + }; + + //TODO: missing unit tests + vm.removePromotion = function(order, scope) { + sdkOrderCloud.Orders.RemovePromotion('outgoing', order.ID, scope.promotion.Code) + .then(function() { + $rootScope.$broadcast('OC:UpdateOrder', order.ID); + vm.promotions.splice(scope.$index, 1); + }); + }; + + vm.cancelOrder = function(order){ + ocConfirm.Confirm({ + message:'Are you sure you want to cancel this order?', + confirmText: 'Yes, cancel order', + type: 'delete'}) + .then(function() { + sdkOrderCloud.Orders.Delete('outgoing', order.ID) + .then(function(){ + $state.go("home",{}, {reload:'base'}) + }); + }); + }; + + //TODO: missing unit tests + $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { + sdkOrderCloud.Orders.ListPromotions('outgoing', orderid) + .then(function(data) { + if (data.Meta) { + vm.promotions = data.Items; + } else { + vm.promotions = data; + } + }); + }); +} \ No newline at end of file diff --git a/src/app/cart/templates/cart.tpl.html b/src/app/cart/templates/cart.html similarity index 100% rename from src/app/cart/templates/cart.tpl.html rename to src/app/cart/templates/cart.html diff --git a/src/app/cart/templates/minicart.tpl.html b/src/app/cart/templates/minicart.html similarity index 100% rename from src/app/cart/templates/minicart.tpl.html rename to src/app/cart/templates/minicart.html diff --git a/src/app/cart/templates/modalMinicart.tpl.html b/src/app/cart/templates/modalMinicart.html similarity index 100% rename from src/app/cart/templates/modalMinicart.tpl.html rename to src/app/cart/templates/modalMinicart.html diff --git a/src/app/common/services/oc-lineitems/oc-lineitems.js b/src/app/common/services/oc-lineitems/oc-lineitems.js index 14e48fa6..2af048bc 100644 --- a/src/app/common/services/oc-lineitems/oc-lineitems.js +++ b/src/app/common/services/oc-lineitems/oc-lineitems.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocLineItems', LineItemFactory) ; -function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { +function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, catalogid) { return { SpecConvert: _specConvert, AddItem: _addItem, @@ -70,7 +70,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { var dfd = $q.defer(); var queue = []; angular.forEach(productIDs, function (productid) { - queue.push(OrderCloud.Me.GetProduct(productid)); + queue.push(sdkOrderCloud.Me.GetProduct(catalogid, productid)); }); $q.all(queue) .then(function (results) { @@ -94,7 +94,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { modalInstance.result .then(function (address) { address.ID = Math.floor(Math.random() * 1000000).toString(); - OrderCloud.LineItems.SetShippingAddress(Order.ID, LineItem.ID, address) + sdkOrderCloud.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address) .then(function () { $rootScope.$broadcast('LineItemAddressUpdated', LineItem.ID, address); }); @@ -102,9 +102,9 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { } function _updateShipping(Order, LineItem, AddressID) { - OrderCloud.Addresses.Get(AddressID) + sdkOrderCloud.Me.GetAddress(AddressID) .then(function (address) { - OrderCloud.LineItems.SetShippingAddress(Order.ID, LineItem.ID, address); + sdkOrderCloud.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address); $rootScope.$broadcast('LineItemAddressUpdated', LineItem.ID, address); }); } @@ -113,14 +113,19 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud) { var li; var dfd = $q.defer(); var queue = []; - OrderCloud.LineItems.List(orderID, null, 1, 100) + var options = { + page: 1, + pageSize: 100 + }; + sdkOrderCloud.LineItems.List('outgoing', orderID, options) .then(function (data) { li = data; if (data.Meta.TotalPages > data.Meta.Page) { var page = data.Meta.Page; while (page < data.Meta.TotalPages) { - page += 1; - queue.push(OrderCloud.LineItems.List(orderID, null, page, 100)); + page++; + options.page = page; + queue.push(sdkOrderCloud.LineItems.List('outgoing', orderID, options)); } } $q.all(queue) From 7b838e03b43c9f81e212706498323cafd707f104 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:21:16 -0500 Subject: [PATCH 065/158] Add Promotion directory structure --- src/app/addPromotion/js/addPromotion.component.js | 15 +++++++++++++++ .../addPromotion.controller.js} | 11 +++-------- .../{addPromotion.tpl.html => addPromotion.html} | 0 src/app/cart/templates/cart.html | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 src/app/addPromotion/js/addPromotion.component.js rename src/app/addPromotion/{addPromotion.js => js/addPromotion.controller.js} (63%) rename src/app/addPromotion/templates/{addPromotion.tpl.html => addPromotion.html} (100%) diff --git a/src/app/addPromotion/js/addPromotion.component.js b/src/app/addPromotion/js/addPromotion.component.js new file mode 100644 index 00000000..d35e60bc --- /dev/null +++ b/src/app/addPromotion/js/addPromotion.component.js @@ -0,0 +1,15 @@ +angular.module('orderCloud') + .component('ocAddPromotion', OrderCloudAddPromotionComponent()) +; + +function OrderCloudAddPromotionComponent() { + var component = { + templateUrl: 'addPromotion/templates/addPromotion.html', + bindings: { + order: '<' + }, + controller: 'AddPromotionComponentCtrl' + }; + + return component; +} \ No newline at end of file diff --git a/src/app/addPromotion/addPromotion.js b/src/app/addPromotion/js/addPromotion.controller.js similarity index 63% rename from src/app/addPromotion/addPromotion.js rename to src/app/addPromotion/js/addPromotion.controller.js index 050109fa..d530dbd7 100644 --- a/src/app/addPromotion/addPromotion.js +++ b/src/app/addPromotion/js/addPromotion.controller.js @@ -1,13 +1,8 @@ angular.module('orderCloud') - .component('ocAddPromotion', { - templateUrl: 'addPromotion/templates/addPromotion.tpl.html', - bindings: { - order: '<' - }, - controller: AddPromotionComponentCtrl - }); + .controller('AddPromotionComponentCtrl', AddPromotionComponentController) +; -function AddPromotionComponentCtrl($exceptionHandler, $rootScope, sdkOrderCloud, toastr) { +function AddPromotionComponentController($exceptionHandler, $rootScope, sdkOrderCloud, toastr) { this.submit = function(orderID, promoCode) { sdkOrderCloud.Orders.AddPromotion('outgoing', orderID, promoCode) .then(function(promo) { diff --git a/src/app/addPromotion/templates/addPromotion.tpl.html b/src/app/addPromotion/templates/addPromotion.html similarity index 100% rename from src/app/addPromotion/templates/addPromotion.tpl.html rename to src/app/addPromotion/templates/addPromotion.html diff --git a/src/app/cart/templates/cart.html b/src/app/cart/templates/cart.html index 99eaa0b4..e38a3e79 100644 --- a/src/app/cart/templates/cart.html +++ b/src/app/cart/templates/cart.html @@ -69,7 +69,7 @@ <h5 ng-repeat="promotion in cart.promotions" class="text-danger"> <div class="row c-line-item__info c-line-item--centered"> <div class="col-sm-5 col-lg-6 c-line-item__info--top"> <h3 class="c-line-item__name"> - <a href="#">{{lineItem.Product.Name}}</a> + <a ui-sref="productDetail({productid: lineItem.Product.ID})">{{lineItem.Product.Name}}</a> </h3> <small class="text-muted c-line-item__id">{{lineItem.ProductID}}</small> <ul class="c-line-item__spec-list" ng-if="lineItem.Specs.length > 0"> From d9e37eeb20b03ac0686d20ebbbd328aa7482399e Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:29:29 -0500 Subject: [PATCH 066/158] Product Quick View directory structure and breaking changes refactor --- .../js/productQuickView.component.js | 23 +++++++ .../js/productQuickView.controller.js | 29 ++++++++ .../js/productQuickView.service.js | 30 ++++++++ src/app/productQuickView/productQuickView.js | 69 ------------------- .../templates/productQuickView.modal.tpl.html | 7 +- 5 files changed, 87 insertions(+), 71 deletions(-) create mode 100644 src/app/productQuickView/js/productQuickView.component.js create mode 100644 src/app/productQuickView/js/productQuickView.controller.js create mode 100644 src/app/productQuickView/js/productQuickView.service.js delete mode 100644 src/app/productQuickView/productQuickView.js diff --git a/src/app/productQuickView/js/productQuickView.component.js b/src/app/productQuickView/js/productQuickView.component.js new file mode 100644 index 00000000..87d63c6e --- /dev/null +++ b/src/app/productQuickView/js/productQuickView.component.js @@ -0,0 +1,23 @@ +angular.module('orderCloud') + .component('ordercloudProductQuickView', OrderCloudProductQuickViewComponent()) + .controller('ProductQuickViewComponentCtrl', ProductQuickViewComponentController) +; + +function OrderCloudProductQuickViewComponent(ocProductQuickView) { + var component = { + bindings: { + product: '<', + currentOrder: '<' + }, + template: '<i class="fa fa-eye text-primary" ng-click="$ctrl.quickView($ctrl.currentOrder, $ctrl.product)"></i>', + controller: 'ProductQuickViewComponentCtrl' + }; + + return component; +} + +function ProductQuickViewComponentController(ocProductQuickView) { + this.quickView = function(currentorder, product){ + ocProductQuickView.Open(currentorder, product); + }; +} \ No newline at end of file diff --git a/src/app/productQuickView/js/productQuickView.controller.js b/src/app/productQuickView/js/productQuickView.controller.js new file mode 100644 index 00000000..221e37ab --- /dev/null +++ b/src/app/productQuickView/js/productQuickView.controller.js @@ -0,0 +1,29 @@ +angular.module('orderCloud') + .controller('ProductQuickViewCtrl', ProductQuickViewController) +; + +function ProductQuickViewController(toastr, $uibModalInstance, SelectedProduct, CurrentOrder, ocLineItems) { + var vm = this; + vm.item = SelectedProduct; + vm.addToCart = function() { + ocLineItems.AddItem(CurrentOrder, vm.item) + .then(function(){ + toastr.success('Product added to cart', 'Success'); + $uibModalInstance.close(); + }); + }; + + vm.findPrice = function(qty){ + var finalPriceBreak = null; + angular.forEach(vm.item.PriceSchedule.PriceBreaks, function(priceBreak) { + if (priceBreak.Quantity <= qty) + finalPriceBreak = angular.copy(priceBreak); + }); + + return finalPriceBreak.Price * qty; + }; + + vm.cancel = function() { + $uibModalInstance.dismiss(); + }; +} \ No newline at end of file diff --git a/src/app/productQuickView/js/productQuickView.service.js b/src/app/productQuickView/js/productQuickView.service.js new file mode 100644 index 00000000..dbbb0814 --- /dev/null +++ b/src/app/productQuickView/js/productQuickView.service.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .service('ocProductQuickView', OrderCloudProductQuickViewService) +; + +function OrderCloudProductQuickViewService($uibModal) { + var service = { + Open: _open + }; + + function _open(currentOrder, product) { + return $uibModal.open({ + backdrop:'static', + templateUrl: 'productQuickView/templates/productQuickView.modal.tpl.html', + controller: 'ProductQuickViewCtrl', + controllerAs: 'productQuickView', + size: 'lg', + animation:false, + resolve: { + SelectedProduct: function() { + return product; + }, + CurrentOrder: function() { + return currentOrder; + } + } + }).result + } + + return service; +} \ No newline at end of file diff --git a/src/app/productQuickView/productQuickView.js b/src/app/productQuickView/productQuickView.js deleted file mode 100644 index c477cb72..00000000 --- a/src/app/productQuickView/productQuickView.js +++ /dev/null @@ -1,69 +0,0 @@ -angular.module('orderCloud') - .service('ProductQuickView', ProductQuickViewService) - .controller('ProductQuickViewCtrl', ProductQuickViewController) - .component('ordercloudProductQuickView', { - bindings: { - product: '<', - currentOrder: '<' - }, - template: '<i class="fa fa-eye text-primary" ng-click="$ctrl.quickView($ctrl.currentOrder, $ctrl.product)"></i>', - controller: function(ProductQuickView){ - this.quickView = function(currentorder, product){ - ProductQuickView.Open(currentorder, product); - }; - } - }) -; - -function ProductQuickViewService($uibModal) { - var service = { - Open: _open - }; - - function _open(currentOrder, product) { - return $uibModal.open({ - backdrop:'static', - templateUrl: 'productQuickView/templates/productQuickView.modal.tpl.html', - controller: 'ProductQuickViewCtrl', - controllerAs: 'productQuickView', - size: 'lg', - animation:false, - resolve: { - SelectedProduct: function() { - return product; - }, - CurrentOrder: function() { - return currentOrder; - } - } - }).result - } - - return service; -} - -function ProductQuickViewController(toastr, $uibModalInstance, SelectedProduct, CurrentOrder, ocLineItems) { - var vm = this; - vm.item = SelectedProduct; - vm.addToCart = function() { - ocLineItems.AddItem(CurrentOrder, vm.item) - .then(function(){ - toastr.success('Product added to cart', 'Success'); - $uibModalInstance.close(); - }); - }; - - vm.findPrice = function(qty){ - var finalPriceBreak = null; - angular.forEach(vm.item.PriceSchedule.PriceBreaks, function(priceBreak) { - if (priceBreak.Quantity <= qty) - finalPriceBreak = angular.copy(priceBreak); - }); - - return finalPriceBreak.Price * qty; - }; - - vm.cancel = function() { - $uibModalInstance.dismiss(); - }; -} \ No newline at end of file diff --git a/src/app/productQuickView/templates/productQuickView.modal.tpl.html b/src/app/productQuickView/templates/productQuickView.modal.tpl.html index 7c2651d3..eca08596 100644 --- a/src/app/productQuickView/templates/productQuickView.modal.tpl.html +++ b/src/app/productQuickView/templates/productQuickView.modal.tpl.html @@ -41,13 +41,16 @@ <h3 class="panel-title">Price Breaks</h3> </table> </div> <oc-spec-form product="productQuickView.item"></oc-spec-form> - <fieldset class="form-group"> + <fieldset class="form-group" ng-if="productQuickView.item.PriceSchedule"> <oc-quantity-input product="productQuickView.item" label="Quantity"></oc-quantity-input> </fieldset> + <div class="alert alert-danger" ng-if="!productQuickView.item.PriceSchedule"> + You are not able to order this product. + </div> </div> </div> </div> - <div class="modal-footer"> + <div class="modal-footer" ng-if="productQuickView.item.PriceSchedule"> <button type="submit" class="btn btn-block btn-success">Add to Cart <span ng-if="productQuickView.item.Quantity" class="badge badge-success">{{productQuickView.findPrice(productQuickView.item.Quantity) | currency}}</span></button> </div> </form> \ No newline at end of file From f95fd28e539d5f7e36a09ebeb9bd12d6aff640d7 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:30:16 -0500 Subject: [PATCH 067/158] Product Quick View directory structure update --- src/app/productQuickView/js/productQuickView.service.js | 2 +- ...ductQuickView.modal.tpl.html => productQuickView.modal.html} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/app/productQuickView/templates/{productQuickView.modal.tpl.html => productQuickView.modal.html} (100%) diff --git a/src/app/productQuickView/js/productQuickView.service.js b/src/app/productQuickView/js/productQuickView.service.js index dbbb0814..b8466d77 100644 --- a/src/app/productQuickView/js/productQuickView.service.js +++ b/src/app/productQuickView/js/productQuickView.service.js @@ -10,7 +10,7 @@ function OrderCloudProductQuickViewService($uibModal) { function _open(currentOrder, product) { return $uibModal.open({ backdrop:'static', - templateUrl: 'productQuickView/templates/productQuickView.modal.tpl.html', + templateUrl: 'productQuickView/templates/productQuickView.modal.html', controller: 'ProductQuickViewCtrl', controllerAs: 'productQuickView', size: 'lg', diff --git a/src/app/productQuickView/templates/productQuickView.modal.tpl.html b/src/app/productQuickView/templates/productQuickView.modal.html similarity index 100% rename from src/app/productQuickView/templates/productQuickView.modal.tpl.html rename to src/app/productQuickView/templates/productQuickView.modal.html From 3323036aa8319d8450995b0760363e17e5716957 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 15:56:21 -0500 Subject: [PATCH 068/158] SDK Update: Product Search and directory structure refactor --- src/app/base/js/base.controller.js | 4 +- .../templates/categoryBrowse.html | 2 +- ...ard.product.tpl.html => card.product.html} | 0 .../templates/favoriteProducts.html | 2 +- .../productBrowse/templates/productView.html | 2 +- .../js/productSearch.component.js | 44 ++++++ .../productSearch/js/productSearch.config.js | 23 +++ .../js/productSearch.controller.js | 54 +++++++ .../js/productSearch.modal.controller.js | 37 +++++ .../productSearch/js/productSearch.service.js | 21 +++ src/app/productSearch/productSearch.js | 149 ------------------ ....tpl.html => productSearch.component.html} | 4 +- ...odal.tpl.html => productSearch.modal.html} | 2 +- ...ts.tpl.html => productSearch.results.html} | 8 +- ....tpl.html => productSearch.typeahead.html} | 2 +- 15 files changed, 195 insertions(+), 159 deletions(-) rename src/app/common/templates/{card.product.tpl.html => card.product.html} (100%) create mode 100644 src/app/productSearch/js/productSearch.component.js create mode 100644 src/app/productSearch/js/productSearch.config.js create mode 100644 src/app/productSearch/js/productSearch.controller.js create mode 100644 src/app/productSearch/js/productSearch.modal.controller.js create mode 100644 src/app/productSearch/js/productSearch.service.js delete mode 100644 src/app/productSearch/productSearch.js rename src/app/productSearch/templates/{productSearch.component.tpl.html => productSearch.component.html} (89%) rename src/app/productSearch/templates/{productSearch.modal.tpl.html => productSearch.modal.html} (96%) rename src/app/productSearch/templates/{productSearch.results.tpl.html => productSearch.results.html} (88%) rename src/app/productSearch/templates/{productSearch.typeahead.tpl.html => productSearch.typeahead.html} (83%) diff --git a/src/app/base/js/base.controller.js b/src/app/base/js/base.controller.js index 6b8808c0..9457ed06 100644 --- a/src/app/base/js/base.controller.js +++ b/src/app/base/js/base.controller.js @@ -2,13 +2,13 @@ angular.module('orderCloud') .controller('BaseCtrl', BaseController) ; -function BaseController($rootScope, $state, sdkOrderCloud, ProductSearch, CurrentUser, CurrentOrder) { +function BaseController($rootScope, $state, sdkOrderCloud, ocProductSearch, CurrentUser, CurrentOrder) { var vm = this; vm.currentUser = CurrentUser; vm.currentOrder = CurrentOrder; vm.mobileSearch = function() { - ProductSearch.Open() + ocProductSearch.Open() .then(function(data) { if (data.productID) { $state.go('productDetail', {productid: data.productID}); diff --git a/src/app/categoryBrowse/templates/categoryBrowse.html b/src/app/categoryBrowse/templates/categoryBrowse.html index 1131da36..f041f61f 100644 --- a/src/app/categoryBrowse/templates/categoryBrowse.html +++ b/src/app/categoryBrowse/templates/categoryBrowse.html @@ -37,7 +37,7 @@ <h3 class="page-header">{{categoryBrowse.productList.Items.length > 1 ? 'Product <div class="row l-product-grid"> <div class="col-sm-6 col-md-4 col-lg-3 l-product-grid__item" ng-repeat="product in categoryBrowse.productList.Items" - ng-include="'common/templates/card.product.tpl.html'"> + ng-include="'common/templates/card.product.html'"> </div> </div> </div> diff --git a/src/app/common/templates/card.product.tpl.html b/src/app/common/templates/card.product.html similarity index 100% rename from src/app/common/templates/card.product.tpl.html rename to src/app/common/templates/card.product.html diff --git a/src/app/favoriteProducts/templates/favoriteProducts.html b/src/app/favoriteProducts/templates/favoriteProducts.html index 1edcc183..31f4fa0b 100644 --- a/src/app/favoriteProducts/templates/favoriteProducts.html +++ b/src/app/favoriteProducts/templates/favoriteProducts.html @@ -36,7 +36,7 @@ <h5 class="pull-left" ng-if="favoriteProducts.list"> <div class="row l-product-grid"> <div class="col-sm-6 col-md-4 col-lg-3 l-product-grid__item" ng-repeat="product in favoriteProducts.list.Items" - ng-include="'common/templates/card.product.tpl.html'"> + ng-include="'common/templates/card.product.html'"> </div> </div> </div> diff --git a/src/app/productBrowse/templates/productView.html b/src/app/productBrowse/templates/productView.html index 22e3e4af..c2bbef6e 100644 --- a/src/app/productBrowse/templates/productView.html +++ b/src/app/productBrowse/templates/productView.html @@ -38,7 +38,7 @@ <h5 class="pull-left"><b>{{(application.$ocMedia('min-width:768px') ? productVie <div class="row l-product-grid"> <div class=" col-xs-6 col-md-4 col-lg-3 l-product-grid__item" ng-repeat="product in productView.list.Items" - ng-include="'common/templates/card.product.tpl.html'"> + ng-include="'common/templates/card.product.html'"> </div> </div> </div> diff --git a/src/app/productSearch/js/productSearch.component.js b/src/app/productSearch/js/productSearch.component.js new file mode 100644 index 00000000..3e674f66 --- /dev/null +++ b/src/app/productSearch/js/productSearch.component.js @@ -0,0 +1,44 @@ +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, sdkOrderCloud, catalogid) { + var vm = this; + + vm.getSearchResults = function() { + var parameters = { + catalogID: catalogid, + search: vm.searchTerm, + page: 1, + pageSize: vm.maxProducts || 5 + }; + return sdkOrderCloud.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', { + searchTerm: 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 new file mode 100644 index 00000000..88c772a6 --- /dev/null +++ b/src/app/productSearch/js/productSearch.config.js @@ -0,0 +1,23 @@ +angular.module('orderCloud') + .config(ProductSearchConfig) +; + +function ProductSearchConfig($stateProvider) { + $stateProvider + .state('productSearchResults', { + parent: 'base', + url: '/productSearchResults/:searchTerm?page&pageSize&sortBy', + templateUrl: 'productSearch/templates/productSearch.results.html', + controller: 'ProductSearchCtrl', + controllerAs: 'productSearch', + resolve: { + Parameters: function(ocParameters, $stateParams) { + return ocParameters.Get($stateParams); + }, + ProductList: function(sdkOrderCloud, Parameters, catalogid) { + var parameters = angular.extend(Parameters, {catalogID: catalogid, pageSize: (Parameters.pageSize || 12)}); + return sdkOrderCloud.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 new file mode 100644 index 00000000..c7b02e17 --- /dev/null +++ b/src/app/productSearch/js/productSearch.controller.js @@ -0,0 +1,54 @@ +angular.module('orderCloud') + .controller('ProductSearchCtrl', ProductSearchController) +; + +function ProductSearchController($state, sdkOrderCloud, 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 sdkOrderCloud.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.modal.controller.js b/src/app/productSearch/js/productSearch.modal.controller.js new file mode 100644 index 00000000..0f417b2e --- /dev/null +++ b/src/app/productSearch/js/productSearch.modal.controller.js @@ -0,0 +1,37 @@ +angular.module('orderCloud') + .controller('ProductSearchModalCtrl', ProductSearchModalController) +; + +function ProductSearchModalController($uibModalInstance, $timeout, $scope, sdkOrderCloud, catalogid) { + var vm = this; + + $timeout(function() { + $('#ProductSearchInput').focus(); + }, 300); + + vm.getSearchResults = function() { + var parameters = { + catalogID: catalogid, + search: vm.searchTerm, + page: 1, + pageSize: vm.maxProducts || 5 + }; + return sdkOrderCloud.Me.ListProducts(parameters) + .then(function(data) { + return data.Items; + }); + }; + + //Mobile functionality + vm.cancel = function() { + $uibModalInstance.dismiss(); + }; + + vm.onSelect = function(productID) { + $uibModalInstance.close({productID: productID}); + }; + + vm.onHardEnter = function(searchTerm) { + $uibModalInstance.close({searchTerm: searchTerm}); + }; +} \ No newline at end of file diff --git a/src/app/productSearch/js/productSearch.service.js b/src/app/productSearch/js/productSearch.service.js new file mode 100644 index 00000000..555faca3 --- /dev/null +++ b/src/app/productSearch/js/productSearch.service.js @@ -0,0 +1,21 @@ +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/productSearch.js b/src/app/productSearch/productSearch.js deleted file mode 100644 index de8e91d9..00000000 --- a/src/app/productSearch/productSearch.js +++ /dev/null @@ -1,149 +0,0 @@ -angular.module('orderCloud') - .config(ProductSearchConfig) - .controller('ProductSearchCtrl', ProductSearchController) - .controller('ProductSearchDirectiveCtrl', ProductSearchDirectiveController) - .controller('ProductSearchModalCtrl', ProductSearchModalController) - .component('ordercloudProductSearch', OrderCloudProductSearchComponent()) - .factory('ProductSearch', ProductSearchService) -; - -function ProductSearchConfig($stateProvider) { - $stateProvider - .state('productSearchResults', { - parent: 'base', - url: '/productSearchResults/:searchTerm?page&pageSize&sortBy', - templateUrl: 'productSearch/templates/productSearch.results.tpl.html', - controller: 'ProductSearchCtrl', - controllerAs: 'productSearch', - resolve: { - Parameters: function(ocParameters, $stateParams) { - return ocParameters.Get($stateParams); - }, - ProductList: function(OrderCloud, Parameters) { - return OrderCloud.Me.ListProducts(Parameters.searchTerm, Parameters.page, Parameters.pageSize || 12, null, Parameters.sortBy); - } - } - }); -} - -function ProductSearchController($state, 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.reverseSort = function() { - Parameters.sortBy.indexOf('!') === 0 ? vm.parameters.sortBy = Parameters.sortBy.split('!')[1] : vm.parameters.sortBy = '!' + Parameters.sortBy; - vm.filter(false); - }; -} - -function OrderCloudProductSearchComponent() { - return { - replace:true, - templateUrl: 'productSearch/templates/productSearch.component.tpl.html', - controller: 'ProductSearchDirectiveCtrl', - bindings: { - maxProducts: '<' - } - }; -} - -function ProductSearchDirectiveController($state, OrderCloud) { - var vm = this; - - vm.getSearchResults = function() { - return OrderCloud.Me.ListProducts(vm.searchTerm, 1, vm.maxProducts || 5) - .then(function(data) { - return data.Items; - }); - }; - - vm.onSelect = function(productID) { - $state.go('productDetail', { - productid: productID - }); - }; - - vm.onHardEnter = function(searchTerm) { - $state.go('productSearchResults', { - searchTerm: searchTerm - }); - }; -} - -function ProductSearchService($uibModal) { - var service = { - Open:_open - }; - - function _open() { - return $uibModal.open({ - backdrop:'static', - templateUrl:'productSearch/templates/productSearch.modal.tpl.html', - controller: 'ProductSearchModalCtrl', - controllerAs: '$ctrl', - size: '-full-screen c-productsearch-modal' - }).result - } - - return service; -} - -function ProductSearchModalController($uibModalInstance, $timeout, $scope, OrderCloud) { - var vm = this; - - $timeout(function() { - $('#ProductSearchInput').focus(); - }, 300); - - vm.getSearchResults = function() { - return OrderCloud.Me.ListProducts(vm.searchTerm, 1, vm.maxProducts || 5) - .then(function(data) { - return data.Items; - }); - }; - - //Mobile functionality - vm.cancel = function() { - $uibModalInstance.dismiss(); - }; - - vm.onSelect = function(productID) { - $uibModalInstance.close({productID: productID}); - }; - - vm.onHardEnter = function(searchTerm) { - $uibModalInstance.close({searchTerm: searchTerm}); - }; -} \ No newline at end of file diff --git a/src/app/productSearch/templates/productSearch.component.tpl.html b/src/app/productSearch/templates/productSearch.component.html similarity index 89% rename from src/app/productSearch/templates/productSearch.component.tpl.html rename to src/app/productSearch/templates/productSearch.component.html index db60d846..b4e77a48 100644 --- a/src/app/productSearch/templates/productSearch.component.tpl.html +++ b/src/app/productSearch/templates/productSearch.component.html @@ -1,4 +1,4 @@ -<form action="." name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit> +<form name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit> <div class="form-group" ng-class="{open:noResults}"> <input type="search" class="form-control" @@ -12,7 +12,7 @@ typeahead-wait-ms="300" typeahead-no-results="noResults" typeahead-loading="loading" - typeahead-template-url="productSearch/templates/productSearch.typeahead.tpl.html" + typeahead-template-url="productSearch/templates/productSearch.typeahead.html" /> <button class="sr-only" type="submit" value="Search"></button> <div class="c-typeahead__results"> diff --git a/src/app/productSearch/templates/productSearch.modal.tpl.html b/src/app/productSearch/templates/productSearch.modal.html similarity index 96% rename from src/app/productSearch/templates/productSearch.modal.tpl.html rename to src/app/productSearch/templates/productSearch.modal.html index 9318f1ee..48a2ddd5 100644 --- a/src/app/productSearch/templates/productSearch.modal.tpl.html +++ b/src/app/productSearch/templates/productSearch.modal.html @@ -9,7 +9,7 @@ <h4 class="modal-title">Search</h4> <input type="text" id="ProductSearchInput" class="form-control" ng-model="$ctrl.searchTerm" uib-typeahead="product as product.Name for product in $ctrl.getSearchResults()" typeahead-append-to="'.c-typeahead__results'" typeahead-on-select="$ctrl.onSelect($item.ID)" typeahead-focus-first="false" typeahead-wait-ms="300" typeahead-no-results="noResults" - typeahead-loading="loading" typeahead-template-url="productSearch/templates/productSearch.typeahead.tpl.html" + typeahead-loading="loading" typeahead-template-url="productSearch/templates/productSearch.typeahead.html" /> </fieldset> <button class="sr-only" type="submit" value="Search"></button> diff --git a/src/app/productSearch/templates/productSearch.results.tpl.html b/src/app/productSearch/templates/productSearch.results.html similarity index 88% rename from src/app/productSearch/templates/productSearch.results.tpl.html rename to src/app/productSearch/templates/productSearch.results.html index 2bfc2d40..6ab2787e 100644 --- a/src/app/productSearch/templates/productSearch.results.tpl.html +++ b/src/app/productSearch/templates/productSearch.results.html @@ -40,7 +40,7 @@ <h5 class="pull-left"><b>{{(application.$ocMedia('min-width:768px') ? productSea <div class="row l-product-grid"> <div class="col-sm-6 col-md-4 col-lg-3 l-product-grid__item" ng-repeat="product in productSearch.list.Items" - ng-include="'common/templates/card.product.tpl.html'"> + ng-include="'common/templates/card.product.html'"> </div> </div> </div> @@ -50,6 +50,7 @@ <h5 class="pull-left"><b>{{(application.$ocMedia('min-width:768px') ? productSea </div> <!-- Pagination --> <uib-pagination + class="pagination-sm pull-right hidden-xs" boundary-links="productSearch.list.Meta.TotalPages > 5" max-size="5" total-items="productSearch.list.Meta.TotalCount" items-per-page="productSearch.list.Meta.PageSize" @@ -57,4 +58,9 @@ <h5 class="pull-left"><b>{{(application.$ocMedia('min-width:768px') ? productSea ng-change="productSearch.pageChanged(productSearch.list.Meta.Page)" ng-if="productSearch.list.Meta.TotalPages > 1"> </uib-pagination> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="productSearch.list.Meta.Page < productSearch.list.Meta.TotalPages" + ng-click="productSearch.loadMore()">Load More + </button> </article> \ No newline at end of file diff --git a/src/app/productSearch/templates/productSearch.typeahead.tpl.html b/src/app/productSearch/templates/productSearch.typeahead.html similarity index 83% rename from src/app/productSearch/templates/productSearch.typeahead.tpl.html rename to src/app/productSearch/templates/productSearch.typeahead.html index 31b08732..49b0014b 100644 --- a/src/app/productSearch/templates/productSearch.typeahead.tpl.html +++ b/src/app/productSearch/templates/productSearch.typeahead.html @@ -1,5 +1,5 @@ <a href tabindex="-1" - ng-attr-title="{{match.label"> + ng-attr-title="{{match.label}}"> <h4 ng-bind-html="(match.model.Name | uibTypeaheadHighlight:query) + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></h4> </a> \ No newline at end of file From 72ffa34a3c93e0641f5541f4b6f03c3d19b8e16f Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 16:01:46 -0500 Subject: [PATCH 069/158] SDK Updates: Common --- .../oc-quantity-input/oc-quantity-input.js | 23 +++++++++---------- .../common/services/oc-authnet/oc-authnet.js | 10 ++++---- src/app/common/services/oc-roles/oc-roles.js | 4 ++-- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js index 72e272c7..1847a333 100644 --- a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js +++ b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js @@ -1,9 +1,8 @@ angular.module('orderCloud') .directive('ocQuantityInput', OCQuantityInput) - ; -function OCQuantityInput(toastr, OrderCloud, $rootScope) { +function OCQuantityInput($rootScope, toastr, sdkOrderCloud) { return { scope: { product: '=', @@ -15,16 +14,17 @@ function OCQuantityInput(toastr, OrderCloud, $rootScope) { templateUrl: 'common/directives/oc-quantity-input/oc-quantity-input.html', replace: true, link: function (scope) { - if (scope.product){ + if (scope.product) { scope.item = scope.product; scope.content = "product" - } - else if(scope.lineitem){ + } else if (scope.lineitem) { scope.item = scope.lineitem; scope.content = "lineitem"; - scope.updateQuantity = function() { + scope.updateQuantity = function () { if (scope.item.Quantity > 0) { - OrderCloud.LineItems.Patch(scope.order.ID, scope.item.ID, {Quantity: scope.item.Quantity}) + sdkOrderCloud.LineItems.Patch('outgoing', scope.order.ID, scope.item.ID, { + Quantity: scope.item.Quantity + }) .then(function (data) { data.Product = scope.lineitem.Product; scope.item = data; @@ -35,11 +35,10 @@ function OCQuantityInput(toastr, OrderCloud, $rootScope) { }); } } - } - else{ - toastr.error('Please input either a product or lineitem attribute in the directive','Error'); - console.error('Please input either a product or lineitem attribute in the quantityInput directive ') + } else { + toastr.error('Please input either a product or lineitem attribute in the directive', 'Error'); + console.error('Please input either a product or lineitem attribute in the quantityInput directive '); } } } -} +} \ No newline at end of file diff --git a/src/app/common/services/oc-authnet/oc-authnet.js b/src/app/common/services/oc-authnet/oc-authnet.js index 6ad5f691..cbc9f280 100644 --- a/src/app/common/services/oc-authnet/oc-authnet.js +++ b/src/app/common/services/oc-authnet/oc-authnet.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocAuthNet', AuthorizeNet) ; -function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { +function AuthorizeNet( $q, $resource, sdkOrderCloud, apiurl, ocCreditCardUtility) { return { 'CreateCreditCard': _createCreateCard, 'UpdateCreditCard': _updateCreditCard, @@ -14,7 +14,7 @@ function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { function _createCreateCard(creditCard, buyerID) { var ExpirationDate = ocCreditCardUtility.ExpirationDateFormat(creditCard.ExpirationMonth, creditCard.ExpirationYear); return _makeApiCall('POST', { - 'buyerID' : buyerID ? buyerID : OrderCloud.BuyerID.Get(), + 'buyerID' : buyerID, 'TransactionType' : 'createCreditCard', 'CardDetails' : { 'CardholderName' : creditCard.CardholderName, @@ -29,7 +29,7 @@ function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { function _updateCreditCard(creditCard, buyerID) { var ExpirationDate = ocCreditCardUtility.ExpirationDateFormat(creditCard.ExpirationMonth, creditCard.ExpirationYear); return _makeApiCall('POST', { - 'buyerID' : buyerID ? buyerID : OrderCloud.BuyerID.Get(), + 'buyerID' : buyerID, 'TransactionType' : 'updateCreditCard', 'CardDetails' : { 'CreditCardID' : creditCard.ID, @@ -43,7 +43,7 @@ function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { } function _deleteCreditCard(creditCard, buyerID) { return _makeApiCall('POST', { - 'buyerID': buyerID ? buyerID : OrderCloud.BuyerID.Get(), + 'buyerID': buyerID, 'TransactionType': 'deleteCreditCard', 'CardDetails': { 'CreditCardID': creditCard.ID @@ -58,7 +58,7 @@ function AuthorizeNet( $q, $resource, OrderCloud, apiurl, ocCreditCardUtility) { callApi: { method: method, headers: { - 'Authorization': 'Bearer ' + OrderCloud.Auth.ReadToken() + 'Authorization': 'Bearer ' + sdkOrderCloud.GetToken() } } }).callApi(requestBody).$promise diff --git a/src/app/common/services/oc-roles/oc-roles.js b/src/app/common/services/oc-roles/oc-roles.js index 53677832..943df39d 100644 --- a/src/app/common/services/oc-roles/oc-roles.js +++ b/src/app/common/services/oc-roles/oc-roles.js @@ -3,7 +3,7 @@ angular.module('orderCloud') .provider('ocRoles', OrderCloudRolesProvider) ; -function OrderCloudRolesService($window, OrderCloud) { +function OrderCloudRolesService($window, sdkOrderCloud) { var service = { Set: _set, Get: _get, @@ -54,7 +54,7 @@ function OrderCloudRolesService($window, OrderCloud) { //Returns local service variable or obtains roles again from token function _get() { - return roles || _set(OrderCloud.Auth.ReadToken()); + return roles || _set(sdkOrderCloud.GetToken()); } //Removes local service variable From 020a2b189c41aba14cc997833196de9e7d1c52a2 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 16:21:53 -0500 Subject: [PATCH 070/158] Removing .tpl from all templates --- src/app/checkout/checkout.js | 4 ++-- src/app/checkout/confirmation/checkout.confirmation.js | 2 +- ...onfirmation.tpl.html => checkout.confirmation.html} | 0 src/app/checkout/payment/checkout.payment.js | 2 +- .../checkout/payment/directives/payment.directives.js | 10 +++++----- .../templates/{creditCard.tpl.html => creditCard.html} | 0 .../templates/{payment.tpl.html => payment.html} | 0 .../templates/{payments.tpl.html => payments.html} | 0 .../{purchaseOrder.tpl.html => purchaseOrder.html} | 0 .../{spendingAccount.tpl.html => spendingAccount.html} | 0 ...checkout.payment.tpl.html => checkout.payment.html} | 0 src/app/checkout/review/checkout.review.js | 2 +- .../{checkout.review.tpl.html => checkout.review.html} | 0 src/app/checkout/shipping/checkout.shipping.js | 2 +- ...eckout.shipping.tpl.html => checkout.shipping.html} | 0 ...sSelect.modal.tpl.html => addressSelect.modal.html} | 0 .../templates/{checkout.tpl.html => checkout.html} | 0 src/app/common/services/oc-lineitems/oc-lineitems.js | 2 +- src/app/favoriteOrders/favoriteOrder.js | 2 +- ...component.tpl.html => favoriteOrder.component.html} | 0 src/app/home/README.md | 4 ++-- src/app/login/js/login.config.js | 2 +- src/app/login/templates/{login.tpl.html => login.html} | 0 src/app/repeatOrder/repeatOrder.js | 1 - 24 files changed, 16 insertions(+), 17 deletions(-) rename src/app/checkout/confirmation/templates/{checkout.confirmation.tpl.html => checkout.confirmation.html} (100%) rename src/app/checkout/payment/directives/templates/{creditCard.tpl.html => creditCard.html} (100%) rename src/app/checkout/payment/directives/templates/{payment.tpl.html => payment.html} (100%) rename src/app/checkout/payment/directives/templates/{payments.tpl.html => payments.html} (100%) rename src/app/checkout/payment/directives/templates/{purchaseOrder.tpl.html => purchaseOrder.html} (100%) rename src/app/checkout/payment/directives/templates/{spendingAccount.tpl.html => spendingAccount.html} (100%) rename src/app/checkout/payment/templates/{checkout.payment.tpl.html => checkout.payment.html} (100%) rename src/app/checkout/review/templates/{checkout.review.tpl.html => checkout.review.html} (100%) rename src/app/checkout/shipping/templates/{checkout.shipping.tpl.html => checkout.shipping.html} (100%) rename src/app/checkout/templates/{addressSelect.modal.tpl.html => addressSelect.modal.html} (100%) rename src/app/checkout/templates/{checkout.tpl.html => checkout.html} (100%) rename src/app/favoriteOrders/templates/{favoriteOrder.component.tpl.html => favoriteOrder.component.html} (100%) rename src/app/login/templates/{login.tpl.html => login.html} (100%) diff --git a/src/app/checkout/checkout.js b/src/app/checkout/checkout.js index f9f9988c..7c399a9a 100644 --- a/src/app/checkout/checkout.js +++ b/src/app/checkout/checkout.js @@ -17,7 +17,7 @@ function checkoutConfig($urlRouterProvider, $stateProvider) { abstract:true, parent: 'base', url: '/checkout', - templateUrl: 'checkout/templates/checkout.tpl.html', + templateUrl: 'checkout/templates/checkout.html', controller: 'CheckoutCtrl', controllerAs: 'checkout', resolve: { @@ -122,7 +122,7 @@ function AddressSelectModalService($uibModal) { function _open(type) { return $uibModal.open({ - templateUrl: 'checkout/templates/addressSelect.modal.tpl.html', + templateUrl: 'checkout/templates/addressSelect.modal.html', controller: 'AddressSelectCtrl', controllerAs: 'addressSelect', backdrop: 'static', diff --git a/src/app/checkout/confirmation/checkout.confirmation.js b/src/app/checkout/confirmation/checkout.confirmation.js index 4c056695..bf54429c 100644 --- a/src/app/checkout/confirmation/checkout.confirmation.js +++ b/src/app/checkout/confirmation/checkout.confirmation.js @@ -7,7 +7,7 @@ function checkoutConfirmationConfig($stateProvider) { .state('confirmation', { parent: 'base', url: '/confirmation/:orderid', - templateUrl: 'checkout/confirmation/templates/checkout.confirmation.tpl.html', + templateUrl: 'checkout/confirmation/templates/checkout.confirmation.html', controller: 'CheckoutConfirmationCtrl', controllerAs: 'checkoutConfirmation', resolve: { diff --git a/src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html b/src/app/checkout/confirmation/templates/checkout.confirmation.html similarity index 100% rename from src/app/checkout/confirmation/templates/checkout.confirmation.tpl.html rename to src/app/checkout/confirmation/templates/checkout.confirmation.html diff --git a/src/app/checkout/payment/checkout.payment.js b/src/app/checkout/payment/checkout.payment.js index e7ea2ba0..8effd7cd 100644 --- a/src/app/checkout/payment/checkout.payment.js +++ b/src/app/checkout/payment/checkout.payment.js @@ -8,7 +8,7 @@ function checkoutPaymentConfig($stateProvider) { $stateProvider .state('checkout.payment', { url: '/payment', - templateUrl: 'checkout/payment/templates/checkout.payment.tpl.html', + templateUrl: 'checkout/payment/templates/checkout.payment.html', controller: 'CheckoutPaymentCtrl', controllerAs: 'checkoutPayment' }) diff --git a/src/app/checkout/payment/directives/payment.directives.js b/src/app/checkout/payment/directives/payment.directives.js index 8d24431d..b3aed785 100644 --- a/src/app/checkout/payment/directives/payment.directives.js +++ b/src/app/checkout/payment/directives/payment.directives.js @@ -29,7 +29,7 @@ function OCPaymentPurchaseOrder() { order: '=', payment: '=?' }, - templateUrl: 'checkout/payment/directives/templates/purchaseOrder.tpl.html', + templateUrl: 'checkout/payment/directives/templates/purchaseOrder.html', controller: 'PaymentPurchaseOrderCtrl' } } @@ -85,7 +85,7 @@ function OCPaymentSpendingAccount() { payment: '=?', excludedSpendingAccounts: '=?excludeOptions' }, - templateUrl: 'checkout/payment/directives/templates/spendingAccount.tpl.html', + templateUrl: 'checkout/payment/directives/templates/spendingAccount.html', controller: 'PaymentSpendingAccountCtrl', controllerAs: 'paymentSA' } @@ -163,7 +163,7 @@ function OCPaymentCreditCard() { payment: '=?', excludedCreditCards: '=?excludeOptions' }, - templateUrl: 'checkout/payment/directives/templates/creditCard.tpl.html', + templateUrl: 'checkout/payment/directives/templates/creditCard.html', controller: 'PaymentCreditCardCtrl', controllerAs: 'paymentCC' } @@ -252,7 +252,7 @@ function OCPayment() { paymentIndex: '=?', excludeOptions: '=?' }, - templateUrl: 'checkout/payment/directives/templates/payment.tpl.html', + templateUrl: 'checkout/payment/directives/templates/payment.html', controller: 'PaymentCtrl', controllerAs: 'ocPayment' } @@ -296,7 +296,7 @@ function OCPayments() { order: '=', methods: '=?' }, - templateUrl: 'checkout/payment/directives/templates/payments.tpl.html', + templateUrl: 'checkout/payment/directives/templates/payments.html', controller: 'PaymentsCtrl' } } diff --git a/src/app/checkout/payment/directives/templates/creditCard.tpl.html b/src/app/checkout/payment/directives/templates/creditCard.html similarity index 100% rename from src/app/checkout/payment/directives/templates/creditCard.tpl.html rename to src/app/checkout/payment/directives/templates/creditCard.html diff --git a/src/app/checkout/payment/directives/templates/payment.tpl.html b/src/app/checkout/payment/directives/templates/payment.html similarity index 100% rename from src/app/checkout/payment/directives/templates/payment.tpl.html rename to src/app/checkout/payment/directives/templates/payment.html diff --git a/src/app/checkout/payment/directives/templates/payments.tpl.html b/src/app/checkout/payment/directives/templates/payments.html similarity index 100% rename from src/app/checkout/payment/directives/templates/payments.tpl.html rename to src/app/checkout/payment/directives/templates/payments.html diff --git a/src/app/checkout/payment/directives/templates/purchaseOrder.tpl.html b/src/app/checkout/payment/directives/templates/purchaseOrder.html similarity index 100% rename from src/app/checkout/payment/directives/templates/purchaseOrder.tpl.html rename to src/app/checkout/payment/directives/templates/purchaseOrder.html diff --git a/src/app/checkout/payment/directives/templates/spendingAccount.tpl.html b/src/app/checkout/payment/directives/templates/spendingAccount.html similarity index 100% rename from src/app/checkout/payment/directives/templates/spendingAccount.tpl.html rename to src/app/checkout/payment/directives/templates/spendingAccount.html diff --git a/src/app/checkout/payment/templates/checkout.payment.tpl.html b/src/app/checkout/payment/templates/checkout.payment.html similarity index 100% rename from src/app/checkout/payment/templates/checkout.payment.tpl.html rename to src/app/checkout/payment/templates/checkout.payment.html diff --git a/src/app/checkout/review/checkout.review.js b/src/app/checkout/review/checkout.review.js index 82a97f9e..d7175c95 100644 --- a/src/app/checkout/review/checkout.review.js +++ b/src/app/checkout/review/checkout.review.js @@ -6,7 +6,7 @@ function checkoutReviewConfig($stateProvider) { $stateProvider .state('checkout.review', { url: '/review', - templateUrl: 'checkout/review/templates/checkout.review.tpl.html', + templateUrl: 'checkout/review/templates/checkout.review.html', controller: 'CheckoutReviewCtrl', controllerAs: 'checkoutReview', resolve: { diff --git a/src/app/checkout/review/templates/checkout.review.tpl.html b/src/app/checkout/review/templates/checkout.review.html similarity index 100% rename from src/app/checkout/review/templates/checkout.review.tpl.html rename to src/app/checkout/review/templates/checkout.review.html diff --git a/src/app/checkout/shipping/checkout.shipping.js b/src/app/checkout/shipping/checkout.shipping.js index 6478b8ed..74f16897 100644 --- a/src/app/checkout/shipping/checkout.shipping.js +++ b/src/app/checkout/shipping/checkout.shipping.js @@ -6,7 +6,7 @@ function checkoutShippingConfig($stateProvider) { $stateProvider .state('checkout.shipping', { url: '/shipping', - templateUrl: 'checkout/shipping/templates/checkout.shipping.tpl.html', + templateUrl: 'checkout/shipping/templates/checkout.shipping.html', controller: 'CheckoutShippingCtrl', controllerAs: 'checkoutShipping' }); diff --git a/src/app/checkout/shipping/templates/checkout.shipping.tpl.html b/src/app/checkout/shipping/templates/checkout.shipping.html similarity index 100% rename from src/app/checkout/shipping/templates/checkout.shipping.tpl.html rename to src/app/checkout/shipping/templates/checkout.shipping.html diff --git a/src/app/checkout/templates/addressSelect.modal.tpl.html b/src/app/checkout/templates/addressSelect.modal.html similarity index 100% rename from src/app/checkout/templates/addressSelect.modal.tpl.html rename to src/app/checkout/templates/addressSelect.modal.html diff --git a/src/app/checkout/templates/checkout.tpl.html b/src/app/checkout/templates/checkout.html similarity index 100% rename from src/app/checkout/templates/checkout.tpl.html rename to src/app/checkout/templates/checkout.html diff --git a/src/app/common/services/oc-lineitems/oc-lineitems.js b/src/app/common/services/oc-lineitems/oc-lineitems.js index 2af048bc..b608e8a6 100644 --- a/src/app/common/services/oc-lineitems/oc-lineitems.js +++ b/src/app/common/services/oc-lineitems/oc-lineitems.js @@ -85,7 +85,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c function _customShipping(Order, LineItem) { var modalInstance = $uibModal.open({ animation: true, - templateUrl: 'common/lineitems/templates/shipping.tpl.html', + templateUrl: 'common/lineitems/templates/shipping.html', controller: 'LineItemModalCtrl', controllerAs: 'liModal', size: 'lg' diff --git a/src/app/favoriteOrders/favoriteOrder.js b/src/app/favoriteOrders/favoriteOrder.js index 011d526b..6c262e29 100644 --- a/src/app/favoriteOrders/favoriteOrder.js +++ b/src/app/favoriteOrders/favoriteOrder.js @@ -4,7 +4,7 @@ angular.module('orderCloud') currentUser: '<', order: '<' }, - templateUrl: 'favoriteOrders/templates/favoriteOrder.component.tpl.html', + templateUrl: 'favoriteOrders/templates/favoriteOrder.component.html', controller: FavoriteOrderCtrl }); diff --git a/src/app/favoriteOrders/templates/favoriteOrder.component.tpl.html b/src/app/favoriteOrders/templates/favoriteOrder.component.html similarity index 100% rename from src/app/favoriteOrders/templates/favoriteOrder.component.tpl.html rename to src/app/favoriteOrders/templates/favoriteOrder.component.html diff --git a/src/app/home/README.md b/src/app/home/README.md index 171c1f22..51a15e9b 100644 --- a/src/app/home/README.md +++ b/src/app/home/README.md @@ -10,7 +10,7 @@ src/ | | | |- home.less | | | |- variables.less | | |- templates/ - | | | |- home.tpl.html + | | | |- home.html | | |- home.js | | |- home.spec.js ``` @@ -58,7 +58,7 @@ title (see the app.js controller). views: { 'main': { controller: 'HomeCtrl', - templateUrl: 'home/home.tpl.html' + templateUrl: 'home/home.html' } }, data:{pageTitle: 'Home'} diff --git a/src/app/login/js/login.config.js b/src/app/login/js/login.config.js index 6cb8b849..62bb10b7 100644 --- a/src/app/login/js/login.config.js +++ b/src/app/login/js/login.config.js @@ -6,7 +6,7 @@ function LoginConfig($stateProvider) { $stateProvider .state('login', { url: '/login/:token', - templateUrl: 'login/templates/login.tpl.html', + templateUrl: 'login/templates/login.html', controller: 'LoginCtrl', controllerAs: 'login' }) diff --git a/src/app/login/templates/login.tpl.html b/src/app/login/templates/login.html similarity index 100% rename from src/app/login/templates/login.tpl.html rename to src/app/login/templates/login.html diff --git a/src/app/repeatOrder/repeatOrder.js b/src/app/repeatOrder/repeatOrder.js index 87d5b1ba..0b4f2b96 100644 --- a/src/app/repeatOrder/repeatOrder.js +++ b/src/app/repeatOrder/repeatOrder.js @@ -49,7 +49,6 @@ function RepeatOrderModalCtrl(LineItems, OrderID, $uibModalInstance, $state, Rep vm.submit = function(){ vm.loading = { - templateUrl:'common/loading-indicators/templates/view.loading.tpl.html', message:'Adding Products to Cart' }; vm.loading.promise = RepeatOrderFactory.AddLineItemsToCart(vm.validLI, vm.orderid) From c89ec98fb21196c9974c0891fe7c8e1b0a8077d1 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 18:03:43 -0500 Subject: [PATCH 071/158] SDK Update: Favorite Orders and refactor directory structure --- .../favoriteOrders.component.js} | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) rename src/app/favoriteOrders/{favoriteOrder.js => js/favoriteOrders.component.js} (74%) diff --git a/src/app/favoriteOrders/favoriteOrder.js b/src/app/favoriteOrders/js/favoriteOrders.component.js similarity index 74% rename from src/app/favoriteOrders/favoriteOrder.js rename to src/app/favoriteOrders/js/favoriteOrders.component.js index 6c262e29..320e89be 100644 --- a/src/app/favoriteOrders/favoriteOrder.js +++ b/src/app/favoriteOrders/js/favoriteOrders.component.js @@ -1,14 +1,22 @@ angular.module('orderCloud') - .component('ordercloudFavoriteOrder', { + .component('ordercloudFavoriteOrder', OrderCloudFavoriteOrderComponent()) + .controller('FavoriteOrderCtrl', FavoriteOrderController) +; + +function OrderCloudFavoriteOrderComponent() { + var component = { bindings:{ currentUser: '<', order: '<' }, templateUrl: 'favoriteOrders/templates/favoriteOrder.component.html', - controller: FavoriteOrderCtrl - }); + controller: 'FavoriteOrderCtrl' + }; + + return component; +} -function FavoriteOrderCtrl(OrderCloud, toastr){ +function FavoriteOrderCtrl(toastr, sdkOrderCloud){ var vm = this; vm.$onInit = function(){ vm.hasFavorites = !!vm.currentUser && !!vm.currentUser.xp && !!vm.currentUser.xp.FavoriteOrders; @@ -27,7 +35,7 @@ function FavoriteOrderCtrl(OrderCloud, toastr){ function addOrder(existingList) { existingList.push(vm.order.ID); - OrderCloud.Me.Patch({xp: {FavoriteOrders: existingList}}) + sdkOrderCloud.Me.Patch({xp: {FavoriteOrders: existingList}}) .then(function(){ vm.isFavorited = true; toastr.success('Order added to your favorites', 'Success'); @@ -36,7 +44,7 @@ function FavoriteOrderCtrl(OrderCloud, toastr){ function removeOrder(){ var updatedList = _.without(vm.currentUser.xp.FavoriteOrders, vm.order.ID); - OrderCloud.Me.Patch({xp: {FavoriteOrders: updatedList}}) + sdkOrderCloud.Me.Patch({xp: {FavoriteOrders: updatedList}}) .then(function(){ vm.isFavorited = false; vm.currentUser.xp.FavoriteOrders = updatedList; From d59ebfa565e401a512a40374ddd8e1996f0c486b Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 18:03:59 -0500 Subject: [PATCH 072/158] SDK Update: Checkout and refactor directory structure --- src/app/cart/js/cart.controller.js | 2 +- src/app/checkout/checkout.js | 162 -------- .../confirmation.config.js} | 44 +-- .../js/confirmation.controller.js | 13 + src/app/checkout/js/checkout.config.js | 56 +++ src/app/checkout/js/checkout.constants.js | 13 + src/app/checkout/js/checkout.controller.js | 55 +++ .../js/checkoutAddressSelect.controller.js | 20 + .../js/checkoutAddressSelect.service.js | 37 ++ src/app/checkout/payment/checkout.payment.js | 88 ----- .../directives/js/creditCard.controller.js | 82 ++++ .../directives/js/creditCard.directive.js | 18 + .../directives/js/payment.controller.js | 34 ++ .../directives/js/payment.directive.js | 20 + .../directives/js/payments.controller.js | 84 ++++ .../directives/js/payments.directive.js | 16 + .../directives/js/purchaseOrder.controller.js | 49 +++ .../directives/js/purchaseOrder.directive.js | 16 + .../js/spendingAccount.controller.js | 74 ++++ .../js/spendingAccount.directive.js | 18 + .../payment/directives/payment.directives.js | 368 ------------------ .../directives/templates/creditCard.html | 3 + .../directives/templates/payments.html | 2 +- .../directives/templates/spendingAccount.html | 3 + src/app/checkout/payment/js/payment.config.js | 14 + .../checkout/payment/js/payment.controller.js | 42 ++ .../checkout/payment/js/payment.service.js | 36 ++ .../review.config.js} | 27 +- .../checkout/review/js/review.controller.js | 9 + .../checkout/shipping/js/shipping.config.js | 13 + .../shipping.controller.js} | 26 +- .../shippingRates.service.js} | 18 +- 32 files changed, 771 insertions(+), 691 deletions(-) delete mode 100644 src/app/checkout/checkout.js rename src/app/checkout/confirmation/{checkout.confirmation.js => js/confirmation.config.js} (52%) create mode 100644 src/app/checkout/confirmation/js/confirmation.controller.js create mode 100644 src/app/checkout/js/checkout.config.js create mode 100644 src/app/checkout/js/checkout.constants.js create mode 100644 src/app/checkout/js/checkout.controller.js create mode 100644 src/app/checkout/js/checkoutAddressSelect.controller.js create mode 100644 src/app/checkout/js/checkoutAddressSelect.service.js delete mode 100644 src/app/checkout/payment/checkout.payment.js create mode 100644 src/app/checkout/payment/directives/js/creditCard.controller.js create mode 100644 src/app/checkout/payment/directives/js/creditCard.directive.js create mode 100644 src/app/checkout/payment/directives/js/payment.controller.js create mode 100644 src/app/checkout/payment/directives/js/payment.directive.js create mode 100644 src/app/checkout/payment/directives/js/payments.controller.js create mode 100644 src/app/checkout/payment/directives/js/payments.directive.js create mode 100644 src/app/checkout/payment/directives/js/purchaseOrder.controller.js create mode 100644 src/app/checkout/payment/directives/js/purchaseOrder.directive.js create mode 100644 src/app/checkout/payment/directives/js/spendingAccount.controller.js create mode 100644 src/app/checkout/payment/directives/js/spendingAccount.directive.js create mode 100644 src/app/checkout/payment/js/payment.config.js create mode 100644 src/app/checkout/payment/js/payment.controller.js create mode 100644 src/app/checkout/payment/js/payment.service.js rename src/app/checkout/review/{checkout.review.js => js/review.config.js} (71%) create mode 100644 src/app/checkout/review/js/review.controller.js create mode 100644 src/app/checkout/shipping/js/shipping.config.js rename src/app/checkout/shipping/{checkout.shipping.js => js/shipping.controller.js} (72%) rename src/app/checkout/shipping/{checkout.shipping.rates.js => js/shippingRates.service.js} (84%) diff --git a/src/app/cart/js/cart.controller.js b/src/app/cart/js/cart.controller.js index 5a7da4e4..1a30af13 100644 --- a/src/app/cart/js/cart.controller.js +++ b/src/app/cart/js/cart.controller.js @@ -8,7 +8,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList vm.promotions = CurrentPromotions.Meta ? CurrentPromotions.Items : CurrentPromotions; vm.removeItem = function(order, scope) { vm.lineLoading = []; - vm.lineLoading[scope.$index] = OrderCloud.LineItems.Delete(order.ID, scope.lineItem.ID) + vm.lineLoading[scope.$index] = sdkOrderCloud.LineItems.Delete('outgoing', order.ID, scope.lineItem.ID) .then(function () { $rootScope.$broadcast('OC:UpdateOrder', order.ID); vm.lineItems.Items.splice(scope.$index, 1); diff --git a/src/app/checkout/checkout.js b/src/app/checkout/checkout.js deleted file mode 100644 index 7c399a9a..00000000 --- a/src/app/checkout/checkout.js +++ /dev/null @@ -1,162 +0,0 @@ -angular.module('orderCloud') - .config(checkoutConfig) - .controller('CheckoutCtrl', CheckoutController) - .factory('AddressSelectModal', AddressSelectModalService) - .controller('AddressSelectCtrl', AddressSelectController) - .constant('CheckoutConfig', { - ShippingRates: true, - TaxRates: false, - AvailablePaymentMethods: ['PurchaseOrder', 'CreditCard', 'SpendingAccount'] - }) -; - -function checkoutConfig($urlRouterProvider, $stateProvider) { - $urlRouterProvider.when('/checkout', '/checkout/shipping'); - $stateProvider - .state('checkout', { - abstract:true, - parent: 'base', - url: '/checkout', - templateUrl: 'checkout/templates/checkout.html', - controller: 'CheckoutCtrl', - controllerAs: 'checkout', - resolve: { - OrderShipAddress: function($q, OrderCloud, CurrentOrder){ - var deferred = $q.defer(); - if (CurrentOrder.ShippingAddressID) { - OrderCloud.Me.GetAddress(CurrentOrder.ShippingAddressID) - .then(function(address) { - deferred.resolve(address); - }) - .catch(function(ex) { - deferred.resolve(null); - }); - } - else { - deferred.resolve(null); - } - - return deferred.promise; - }, - CurrentPromotions: function(CurrentOrder, OrderCloud) { - return OrderCloud.Orders.ListPromotions(CurrentOrder.ID); - }, - OrderBillingAddress: function($q, OrderCloud, CurrentOrder){ - var deferred = $q.defer(); - - if (CurrentOrder.BillingAddressID) { - OrderCloud.Me.GetAddress(CurrentOrder.BillingAddressID) - .then(function(address) { - deferred.resolve(address); - }) - .catch(function(ex) { - deferred.resolve(null); - }); - } - else { - deferred.resolve(null); - } - return deferred.promise; - } - } - }) - ; -} - -function CheckoutController($state, $rootScope, toastr, OrderCloud, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { - var vm = this; - vm.shippingAddress = OrderShipAddress; - vm.billingAddress = OrderBillingAddress; - vm.promotions = CurrentPromotions.Items; - vm.checkoutConfig = CheckoutConfig; - - vm.submitOrder = function(order) { - OrderCloud.Orders.Submit(order.ID) - .then(function(order) { - $state.go('confirmation', {orderid:order.ID}, {reload:'base'}); - toastr.success('Your order has been submitted', 'Success'); - }) - .catch(function(ex) { - toastr.error('Your order did not submit successfully.', 'Error'); - }); - }; - - $rootScope.$on('OC:OrderShipAddressUpdated', function(event, order) { - OrderCloud.Me.GetAddress(order.ShippingAddressID) - .then(function(address){ - vm.shippingAddress = address; - }); - }); - - $rootScope.$on('OC:OrderBillAddressUpdated', function(event, order){ - OrderCloud.Me.GetAddress(order.BillingAddressID) - .then(function(address){ - vm.billingAddress = address; - }); - }); - - vm.removePromotion = function(order, promotion) { - OrderCloud.Orders.RemovePromotion(order.ID, promotion.Code) - .then(function() { - $rootScope.$broadcast('OC:UpdatePromotions', order.ID); - }) - }; - - $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { - OrderCloud.Orders.ListPromotions(orderid) - .then(function(data) { - if (data.Meta) { - vm.promotions = data.Items; - } else { - vm.promotions = data; - } - $rootScope.$broadcast('OC:UpdateOrder', orderid); - }) - }); -} - -function AddressSelectModalService($uibModal) { - var service = { - Open: _open - }; - - function _open(type) { - return $uibModal.open({ - templateUrl: 'checkout/templates/addressSelect.modal.html', - controller: 'AddressSelectCtrl', - controllerAs: 'addressSelect', - backdrop: 'static', - size: 'md', - resolve: { - Addresses: function(OrderCloud) { - if (type == 'shipping') { - return OrderCloud.Me.ListAddresses(null, 1, 100, null, null, {Shipping: true}); - } else if (type == 'billing') { - return OrderCloud.Me.ListAddresses(null, 1, 100, null, null, {Billing: true}); - } else { - return OrderCloud.Me.ListAddresses(null, 1, 100); - } - } - } - }).result; - } - - return service; -} - -function AddressSelectController($uibModalInstance, Addresses) { - var vm = this; - vm.addresses = Addresses; - - vm.select = function (address) { - $uibModalInstance.close(address); - }; - - vm.createAddress = function() { - $uibModalInstance.close('create'); - }; - - vm.cancel = function () { - $uibModalInstance.dismiss(); - }; -} \ No newline at end of file diff --git a/src/app/checkout/confirmation/checkout.confirmation.js b/src/app/checkout/confirmation/js/confirmation.config.js similarity index 52% rename from src/app/checkout/confirmation/checkout.confirmation.js rename to src/app/checkout/confirmation/js/confirmation.config.js index bf54429c..7ee89595 100644 --- a/src/app/checkout/confirmation/checkout.confirmation.js +++ b/src/app/checkout/confirmation/js/confirmation.config.js @@ -1,8 +1,8 @@ angular.module('orderCloud') - .config(checkoutConfirmationConfig) - .controller('CheckoutConfirmationCtrl', CheckoutConfirmationController); + .config(CheckoutConfirmationConfig) +; -function checkoutConfirmationConfig($stateProvider) { +function CheckoutConfirmationConfig($stateProvider) { $stateProvider .state('confirmation', { parent: 'base', @@ -11,28 +11,28 @@ function checkoutConfirmationConfig($stateProvider) { controller: 'CheckoutConfirmationCtrl', controllerAs: 'checkoutConfirmation', resolve: { - SubmittedOrder: function($stateParams, OrderCloud) { - return OrderCloud.Me.GetOrder($stateParams.orderid); + SubmittedOrder: function($stateParams, sdkOrderCloud) { + return sdkOrderCloud.Orders.Get('outgoing', $stateParams.orderid); }, - OrderShipAddress: function(SubmittedOrder, OrderCloud){ - return OrderCloud.Me.GetAddress(SubmittedOrder.ShippingAddressID); + OrderShipAddress: function(SubmittedOrder, sdkOrderCloud){ + return sdkOrderCloud.Me.GetAddress(SubmittedOrder.ShippingAddressID); }, - OrderPromotions: function(SubmittedOrder, OrderCloud) { - return OrderCloud.Orders.ListPromotions(SubmittedOrder.ID); + OrderPromotions: function(SubmittedOrder, sdkOrderCloud) { + return sdkOrderCloud.Orders.ListPromotions('outgoing', SubmittedOrder.ID); }, - OrderBillingAddress: function(SubmittedOrder, OrderCloud){ - return OrderCloud.Me.GetAddress(SubmittedOrder.BillingAddressID); + OrderBillingAddress: function(SubmittedOrder, sdkOrderCloud){ + return sdkOrderCloud.Me.GetAddress(SubmittedOrder.BillingAddressID); }, - OrderPayments: function($q, SubmittedOrder, OrderCloud) { + OrderPayments: function($q, SubmittedOrder, sdkOrderCloud) { var deferred = $q.defer(); - OrderCloud.Payments.List(SubmittedOrder.ID) + sdkOrderCloud.Payments.List('outgoing', SubmittedOrder.ID) .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) + sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -42,7 +42,7 @@ function checkoutConfirmationConfig($stateProvider) { } else if (payment.Type === 'SpendingAccount' && payment.SpendingAccountID) { queue.push((function() { var d = $q.defer(); - OrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -59,9 +59,9 @@ function checkoutConfirmationConfig($stateProvider) { return deferred.promise; }, - LineItemsList: function($q, $state, toastr, ocLineItems, SubmittedOrder, OrderCloud) { + LineItemsList: function($q, $state, toastr, ocLineItems, SubmittedOrder, sdkOrderCloud) { var dfd = $q.defer(); - OrderCloud.LineItems.List(SubmittedOrder.ID) + sdkOrderCloud.LineItems.List('outgoing', SubmittedOrder.ID, {pageSize: 100}) .then(function(data) { ocLineItems.GetProductInfo(data.Items) .then(function() { @@ -72,14 +72,4 @@ function checkoutConfirmationConfig($stateProvider) { } } }); -} - -function CheckoutConfirmationController(SubmittedOrder, OrderShipAddress, OrderPromotions, OrderBillingAddress, OrderPayments, LineItemsList) { - var vm = this; - vm.order = SubmittedOrder; - vm.shippingAddress = OrderShipAddress; - vm.promotions = OrderPromotions.Items; - vm.billingAddress = OrderBillingAddress; - vm.payments = OrderPayments.Items; - vm.lineItems = LineItemsList; } \ No newline at end of file diff --git a/src/app/checkout/confirmation/js/confirmation.controller.js b/src/app/checkout/confirmation/js/confirmation.controller.js new file mode 100644 index 00000000..161b2d4b --- /dev/null +++ b/src/app/checkout/confirmation/js/confirmation.controller.js @@ -0,0 +1,13 @@ +angular.module('orderCloud') + .controller('CheckoutConfirmationCtrl', CheckoutConfirmationController) +; + +function CheckoutConfirmationController(SubmittedOrder, OrderShipAddress, OrderPromotions, OrderBillingAddress, OrderPayments, LineItemsList) { + var vm = this; + vm.order = SubmittedOrder; + vm.shippingAddress = OrderShipAddress; + vm.promotions = OrderPromotions.Items; + vm.billingAddress = OrderBillingAddress; + vm.payments = OrderPayments.Items; + vm.lineItems = LineItemsList; +} \ No newline at end of file diff --git a/src/app/checkout/js/checkout.config.js b/src/app/checkout/js/checkout.config.js new file mode 100644 index 00000000..4daa70c7 --- /dev/null +++ b/src/app/checkout/js/checkout.config.js @@ -0,0 +1,56 @@ +angular.module('orderCloud') + .config(CheckoutConfig) +; + +function CheckoutConfig($urlRouterProvider, $stateProvider) { + $urlRouterProvider.when('/checkout', '/checkout/shipping'); + $stateProvider + .state('checkout', { + abstract:true, + parent: 'base', + url: '/checkout', + templateUrl: 'checkout/templates/checkout.html', + controller: 'CheckoutCtrl', + controllerAs: 'checkout', + resolve: { + OrderShipAddress: function($q, sdkOrderCloud, CurrentOrder){ + var deferred = $q.defer(); + if (CurrentOrder.ShippingAddressID) { + sdkOrderCloud.Me.GetAddress(CurrentOrder.ShippingAddressID) + .then(function(address) { + deferred.resolve(address); + }) + .catch(function(ex) { + deferred.resolve(null); + }); + } + else { + deferred.resolve(null); + } + + return deferred.promise; + }, + CurrentPromotions: function(CurrentOrder, sdkOrderCloud) { + return sdkOrderCloud.Orders.ListPromotions('outgoing', CurrentOrder.ID); + }, + OrderBillingAddress: function($q, sdkOrderCloud, CurrentOrder){ + var deferred = $q.defer(); + + if (CurrentOrder.BillingAddressID) { + sdkOrderCloud.Me.GetAddress(CurrentOrder.BillingAddressID) + .then(function(address) { + deferred.resolve(address); + }) + .catch(function(ex) { + deferred.resolve(null); + }); + } + else { + deferred.resolve(null); + } + return deferred.promise; + } + } + }) + ; +} \ No newline at end of file diff --git a/src/app/checkout/js/checkout.constants.js b/src/app/checkout/js/checkout.constants.js new file mode 100644 index 00000000..f19a61bc --- /dev/null +++ b/src/app/checkout/js/checkout.constants.js @@ -0,0 +1,13 @@ +angular.module('orderCloud') + .constant('CheckoutConfig', CheckoutConfigConstants()) +; + +function CheckoutConfigConstants() { + var constants = { + ShippingRates: true, + TaxRates: false, + AvailablePaymentMethods: ['PurchaseOrder', 'CreditCard', 'SpendingAccount'] + }; + + return constants; +} \ No newline at end of file diff --git a/src/app/checkout/js/checkout.controller.js b/src/app/checkout/js/checkout.controller.js new file mode 100644 index 00000000..ef83e9fe --- /dev/null +++ b/src/app/checkout/js/checkout.controller.js @@ -0,0 +1,55 @@ +angular.module('orderCloud') + .controller('CheckoutCtrl', CheckoutController) +; + +function CheckoutController($state, $rootScope, toastr, sdkOrderCloud, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { + var vm = this; + vm.shippingAddress = OrderShipAddress; + vm.billingAddress = OrderBillingAddress; + vm.promotions = CurrentPromotions.Items; + vm.checkoutConfig = CheckoutConfig; + + vm.submitOrder = function(order) { + sdkOrderCloud.Orders.Submit('outgoing', order.ID) + .then(function(order) { + $state.go('confirmation', {orderid:order.ID}, {reload:'base'}); + toastr.success('Your order has been submitted', 'Success'); + }) + .catch(function(ex) { + toastr.error('Your order did not submit successfully.', 'Error'); + }); + }; + + $rootScope.$on('OC:OrderShipAddressUpdated', function(event, order) { + sdkOrderCloud.Me.GetAddress(order.ShippingAddressID) + .then(function(address){ + vm.shippingAddress = address; + }); + }); + + $rootScope.$on('OC:OrderBillAddressUpdated', function(event, order){ + sdkOrderCloud.Me.GetAddress(order.BillingAddressID) + .then(function(address){ + vm.billingAddress = address; + }); + }); + + vm.removePromotion = function(order, promotion) { + sdkOrderCloud.Orders.RemovePromotion('outgoing', order.ID, promotion.Code) + .then(function() { + $rootScope.$broadcast('OC:UpdatePromotions', order.ID); + }) + }; + + $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { + sdkOrderCloud.Orders.ListPromotions('outgoing', orderid) + .then(function(data) { + if (data.Meta) { + vm.promotions = data.Items; + } else { + vm.promotions = data; + } + $rootScope.$broadcast('OC:UpdateOrder', orderid); + }) + }); +} \ No newline at end of file diff --git a/src/app/checkout/js/checkoutAddressSelect.controller.js b/src/app/checkout/js/checkoutAddressSelect.controller.js new file mode 100644 index 00000000..43301e76 --- /dev/null +++ b/src/app/checkout/js/checkoutAddressSelect.controller.js @@ -0,0 +1,20 @@ +angular.module('orderCloud') + .controller('AddressSelectCtrl', AddressSelectController) +; + +function AddressSelectController($uibModalInstance, Addresses) { + var vm = this; + vm.addresses = Addresses; + + vm.select = function (address) { + $uibModalInstance.close(address); + }; + + vm.createAddress = function() { + $uibModalInstance.close('create'); + }; + + vm.cancel = function () { + $uibModalInstance.dismiss(); + }; +} \ No newline at end of file diff --git a/src/app/checkout/js/checkoutAddressSelect.service.js b/src/app/checkout/js/checkoutAddressSelect.service.js new file mode 100644 index 00000000..90b95e3c --- /dev/null +++ b/src/app/checkout/js/checkoutAddressSelect.service.js @@ -0,0 +1,37 @@ +angular.module('orderCloud') + .factory('ocAddressSelect', OrderCloudAddressSelectService) +; + +function OrderCloudAddressSelectService($uibModal, sdkOrderCloud) { + var service = { + Open: _open + }; + + function _open(type) { + return $uibModal.open({ + templateUrl: 'checkout/templates/addressSelect.modal.html', + controller: 'AddressSelectCtrl', + controllerAs: 'addressSelect', + backdrop: 'static', + size: 'md', + resolve: { + Addresses: function(sdkOrderCloud) { + var options = { + page: 1, + pageSize: 100 + }; + + if (type == 'shipping') { + options.filters = {Shipping: true}; + } else if (type == 'billing') { + options.filters = {Billing: true}; + } + + return sdkOrderCloud.Me.ListAddresses(options); + } + } + }).result; + } + + return service; +} \ No newline at end of file diff --git a/src/app/checkout/payment/checkout.payment.js b/src/app/checkout/payment/checkout.payment.js deleted file mode 100644 index 8effd7cd..00000000 --- a/src/app/checkout/payment/checkout.payment.js +++ /dev/null @@ -1,88 +0,0 @@ -angular.module('orderCloud') - .config(checkoutPaymentConfig) - .controller('CheckoutPaymentCtrl', CheckoutPaymentController) - .factory('CheckoutPaymentService', CheckoutPaymentService) -; - -function checkoutPaymentConfig($stateProvider) { - $stateProvider - .state('checkout.payment', { - url: '/payment', - templateUrl: 'checkout/payment/templates/checkout.payment.html', - controller: 'CheckoutPaymentCtrl', - controllerAs: 'checkoutPayment' - }) - ; -} - -function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, OrderCloud, AddressSelectModal, MyAddressesModal) { - var vm = this; - vm.createAddress = createAddress; - vm.changeBillingAddress = changeBillingAddress; - - function createAddress(order){ - return MyAddressesModal.Create() - .then(function(address) { - toastr.success('Address Created', 'Success'); - order.BillingAddressID = address.ID; - saveBillingAddress(order); - }); - } - - function changeBillingAddress(order) { - AddressSelectModal.Open('billing') - .then(function(address) { - if (address == 'create') { - createAddress(order); - } else { - order.BillingAddressID = address.ID; - saveBillingAddress(order); - } - }); - } - - function saveBillingAddress(order) { - if (order && order.BillingAddressID) { - OrderCloud.Orders.Patch(order.ID, {BillingAddressID: order.BillingAddressID}) - .then(function(updatedOrder) { - $rootScope.$broadcast('OC:OrderBillAddressUpdated', updatedOrder); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - } - } -} - -function CheckoutPaymentService($q, OrderCloud) { - var service = { - PaymentsExceedTotal: _paymentsExceedTotal, - RemoveAllPayments: _removeAllPayments - }; - - function _paymentsExceedTotal(payments, orderTotal) { - var paymentTotal = 0; - angular.forEach(payments.Items, function(payment) { - paymentTotal += payment.Amount; - }); - - return paymentTotal.toFixed(2) > orderTotal; - } - - function _removeAllPayments(payments, order) { - var deferred = $q.defer(); - - var queue = []; - angular.forEach(payments.Items, function(payment) { - queue.push(OrderCloud.Payments.Delete(order.ID, payment.ID)); - }); - - $q.all(queue).then(function() { - deferred.resolve(); - }); - - return deferred.promise; - } - - return service; -} diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js new file mode 100644 index 00000000..4deb6611 --- /dev/null +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -0,0 +1,82 @@ +angular.module('orderCloud') + .controller('PaymentCreditCardCtrl', PaymentCreditCardController) +; + +function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocMyCreditCards) { + var creditCardListOptions = { + page: 1, + pageSize: 100 + }; + sdkOrderCloud.Me.ListCreditCards(creditCardListOptions) + .then(function(data) { + $scope.creditCards = data.Items; + }); + + if (!$scope.payment) { + sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + .then(function(data) { + if (data.Items.length) { + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { + Type: 'CreditCard', + xp: { + PONumber: null + }, + SpendingAccountID: null, + Amount: null + }).then(function(data) { + $scope.payment = data; + if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; + }); + } else { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'CreditCard'}) + .then(function(data) { + $scope.payment = data; + $scope.showPaymentOptions = true; + }); + } + }); + } else { + delete $scope.payment.SpendingAccountID; + if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; + if (!$scope.payment.CreditCardID) $scope.showPaymentOptions = true; + } + + $scope.changePayment = function() { + $scope.showPaymentOptions = true; + }; + + $scope.$watch('payment', function(n,o) { + if (n && !n.CreditCardID) { + $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', false); + } else { + $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', true); + + } + }, true); + + $scope.updatePayment = function(scope) { + var oldSelection = angular.copy($scope.payment.CreditCardID); + $scope.payment.CreditCardID = scope.creditCard.ID; + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + $scope.updatingCreditCardPayment = sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) + .then(function() { + $scope.showPaymentOptions = false; + toastr.success('Using ' + $filter('humanize')(scope.creditCard.CardType) + ' ending in ' + scope.creditCard.PartialAccountNumber,'Credit Card Payment'); + $rootScope.$broadcast('OC:PaymentsUpdated'); + }) + .catch(function(ex) { + $scope.payment.CreditCardID = oldSelection; + $exceptionHandler(ex); + }); + }; + + $scope.createCreditCard = function() { + ocMyCreditCards.Create() + .then(function(card) { + toastr.success('Credit Card Created', 'Success'); + $scope.creditCards.push(card); + $scope.updatePayment({creditCard:card}); + }); + }; +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/creditCard.directive.js b/src/app/checkout/payment/directives/js/creditCard.directive.js new file mode 100644 index 00000000..50d330aa --- /dev/null +++ b/src/app/checkout/payment/directives/js/creditCard.directive.js @@ -0,0 +1,18 @@ +angular.module('orderCloud') + //Single Credit Card Payment + .directive('ocPaymentCc', OrderCloudPaymentCreditCardDirective) +; + +function OrderCloudPaymentCreditCardDirective() { + return { + restrict:'E', + scope: { + order: '=', + payment: '=?', + excludedCreditCards: '=?excludeOptions' + }, + templateUrl: 'checkout/payment/directives/templates/creditCard.html', + controller: 'PaymentCreditCardCtrl', + controllerAs: 'paymentCC' + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js new file mode 100644 index 00000000..56a625fb --- /dev/null +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -0,0 +1,34 @@ +angular.module('orderCloud') + .controller('PaymentCtrl', PaymentController) +; + +function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { + if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; + if (!$scope.payment) { + sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + .then(function(data) { + if (ocCheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { + ocCheckoutPaymentService.RemoveAllPayments(data, $scope.order) + .then(function(data) { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) + .then(function(data) { + $scope.payment = data; + $rootScope.$broadcast('OC:PaymentsUpdated'); + }); + }); + } + else if (data.Items.length) { + $scope.payment = data.Items[0]; + if ($scope.methods.length == 1) $scope.payment.Type = $scope.methods[0]; + } else { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) + .then(function(data) { + $scope.payment = data; + $rootScope.$broadcast('OC:PaymentsUpdated'); + }); + } + }); + } else if ($scope.methods.length == 1) { + $scope.payment.Type = $scope.methods[0]; + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/payment.directive.js b/src/app/checkout/payment/directives/js/payment.directive.js new file mode 100644 index 00000000..26591c12 --- /dev/null +++ b/src/app/checkout/payment/directives/js/payment.directive.js @@ -0,0 +1,20 @@ +angular.module('orderCloud') + //Single Payment, Multiple Types + .directive('ocPayment', OrderCloudPaymentDirective) +; + +function OrderCloudPaymentDirective() { + return { + restrict:'E', + scope: { + order: '=', + methods: '=?', + payment: '=?', + paymentIndex: '=?', + excludeOptions: '=?' + }, + templateUrl: 'checkout/payment/directives/templates/payment.html', + controller: 'PaymentCtrl', + controllerAs: 'ocPayment' + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/payments.controller.js b/src/app/checkout/payment/directives/js/payments.controller.js new file mode 100644 index 00000000..adb913f5 --- /dev/null +++ b/src/app/checkout/payment/directives/js/payments.controller.js @@ -0,0 +1,84 @@ +angular.module('orderCloud') + .controller('PaymentsCtrl', PaymentsController) +; + +function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { + if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; + + sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + .then(function(data) { + if (!data.Items.length) { + $scope.payments = {Items: []}; + $scope.addNewPayment(false); + } + else if (ocCheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { + ocCheckoutPaymentService.RemoveAllPayments(data, $scope.order) + .then(function(data) { + $scope.payments = {Items: []}; + $scope.addNewPayment(false); + }); + } + else { + $scope.payments = data; + calculateMaxTotal(); + } + }); + + $scope.addNewPayment = function(notify) { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) + .then(function(data) { + $scope.payments.Items.push(data); + calculateMaxTotal(); + if (notify) toastr.success('Payment Added'); + }); + }; + + $scope.removePayment = function(scope) { + // TODO: when api bug EX-1053 is fixed refactor this to simply delete the payment + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + return sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, {Type: 'PurchaseOrder', SpendingAccountID: null}) + .then(function() { + return sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, scope.payment.ID) + .then(function(){ + $scope.payments.Items.splice(scope.$index, 1); + calculateMaxTotal(); + return toastr.success('Payment Removed'); + }); + }); + }; + + $scope.updatePaymentAmount = function(scope) { + if (scope.payment.Amount > scope.payment.MaxAmount || !scope.payment.Amount) return; + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, scope.payment) + .then(function(data) { + toastr.success('Payment Amount Updated'); + calculateMaxTotal(); + }) + .catch(function(ex) { + $exceptionHandler(ex); + }); + }; + + $rootScope.$on('OC:PaymentsUpdated', function() { + calculateMaxTotal(); + }); + + + function calculateMaxTotal() { + var paymentTotal = 0; + $scope.excludeOptions = { + SpendingAccounts: [], + CreditCards: [] + }; + angular.forEach($scope.payments.Items, function(payment) { + paymentTotal += payment.Amount; + if (payment.SpendingAccountID) $scope.excludeOptions.SpendingAccounts.push(payment.SpendingAccountID); + if (payment.CreditCardID) $scope.excludeOptions.CreditCards.push(payment.CreditCardID); + var maxAmount = $scope.order.Total - _.reduce(_.pluck($scope.payments.Items, 'Amount'), function(a, b) {return a + b; }); + payment.MaxAmount = (payment.Amount + maxAmount).toFixed(2); + }); + $scope.canAddPayment = paymentTotal < $scope.order.Total; + if($scope.OCPayments) $scope.OCPayments.$setValidity('Insufficient_Payment', !$scope.canAddPayment); + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/payments.directive.js b/src/app/checkout/payment/directives/js/payments.directive.js new file mode 100644 index 00000000..f04251da --- /dev/null +++ b/src/app/checkout/payment/directives/js/payments.directive.js @@ -0,0 +1,16 @@ +angular.module('orderCloud') + //Multiple Payment, Multiple Types + .directive('ocPayments', OrderCloudPaymentsDirective) +; + +function OrderCloudPaymentsDirective() { + return { + restrict:'E', + scope: { + order: '=', + methods: '=?' + }, + templateUrl: 'checkout/payment/directives/templates/payments.html', + controller: 'PaymentsCtrl' + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js new file mode 100644 index 00000000..e490e6d4 --- /dev/null +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -0,0 +1,49 @@ +angular.module('orderCloud') + .controller('PaymentPurchaseOrderCtrl', PaymentPurchaseOrderController) +; + +function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud) { + if (!$scope.payment) { + sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + .then(function(data) { + if (data.Items.length) { + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { + Type: 'PurchaseOrder', + CreditCardID: null, + SpendingAccountID: null, + Amount: null + }).then(function(data) { + $scope.payment = data; + }); + } else { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'PurchaseOrder'}) + .then(function(data) { + $scope.payment = data; + }); + } + }); + } else if (!($scope.payment.Type == "PurchaseOrder" && $scope.payment.CreditCardID == null && $scope.payment.SpendingAccountID == null)) { + $scope.payment.Type = "PurchaseOrder"; + $scope.payment.CreditCardID = null; + $scope.payment.SpendingAccountID = null; + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment).then(function() { + toastr.success('Paying by purchase order', 'Purchase Order Payment'); + $rootScope.$broadcast('OC:PaymentsUpdated'); + }); + } + + $scope.updatePayment = function() { + if ($scope.payment.xp && $scope.payment.xp.PONumber && (!$scope.payment.xp.PONumber.length)) $scope.payment.xp.PONumber = null; + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) + .then(function() { + toastr.success('Purchase Order Number Saved'); + $rootScope.$broadcast('OC:PaymentsUpdated'); + }) + .catch(function(ex) { + $exceptionHandler(ex); + }); + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.directive.js b/src/app/checkout/payment/directives/js/purchaseOrder.directive.js new file mode 100644 index 00000000..2f32517b --- /dev/null +++ b/src/app/checkout/payment/directives/js/purchaseOrder.directive.js @@ -0,0 +1,16 @@ +angular.module('orderCloud') + //Single Purchase Order Payment + .directive('ocPaymentPo', OrderCloudPaymentPurchaseOrderDirective) +; + +function OrderCloudPaymentPurchaseOrderDirective() { + return { + restrict:'E', + scope: { + order: '=', + payment: '=?' + }, + templateUrl: 'checkout/payment/directives/templates/purchaseOrder.html', + controller: 'PaymentPurchaseOrderCtrl' + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/spendingAccount.controller.js b/src/app/checkout/payment/directives/js/spendingAccount.controller.js new file mode 100644 index 00000000..95e8f545 --- /dev/null +++ b/src/app/checkout/payment/directives/js/spendingAccount.controller.js @@ -0,0 +1,74 @@ +angular.module('orderCloud') + .controller('PaymentSpendingAccountCtrl', PaymentSpendingAccountController) +; + +function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud) { + var spendingAccountListOptions = { + page: 1, + pageSize: 100, + filters: {RedemptionCode: '!*', AllowAsPaymentMethod: true} + }; + sdkOrderCloud.Me.ListSpendingAccounts(spendingAccountListOptions) + .then(function(data) { + $scope.spendingAccounts = data.Items; + }); + + if (!$scope.payment) { + sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + .then(function(data) { + if (data.Items.length) { + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { + Type: 'SpendingAccount', + xp: { + PONumber:null + }, + CreditCardID:null, + SpendingAccountID:null, + Amount:null + }).then(function(data) { + $scope.payment = data; + if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; + }); + } else { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'SpendingAccount'}) + .then(function(data) { + $scope.payment = data; + $scope.showPaymentOptions = true; + }); + } + }); + } else { + delete $scope.payment.CreditCardID; + if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; + if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; + } + + $scope.changePayment = function() { + $scope.showPaymentOptions = true; + }; + + $scope.updatePayment = function(scope) { + var oldSelection = angular.copy($scope.payment.SpendingAccountID); + $scope.payment.SpendingAccountID = scope.spendingAccount.ID; + //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + $scope.updatingSpendingAccountPayment = sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) + .then(function() { + $scope.showPaymentOptions = false; + toastr.success('Using ' + scope.spendingAccount.Name,'Spending Account Payment'); + $rootScope.$broadcast('OC:PaymentsUpdated'); + }) + .catch(function(ex) { + $scope.payment.SpendingAccountID = oldSelection; + $exceptionHandler(ex); + }); + }; + + $scope.$watch('payment', function(n,o) { + if (n && !n.SpendingAccountID) { + $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', false); + } else { + $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', true); + } + }, true); +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/spendingAccount.directive.js b/src/app/checkout/payment/directives/js/spendingAccount.directive.js new file mode 100644 index 00000000..f3898e5d --- /dev/null +++ b/src/app/checkout/payment/directives/js/spendingAccount.directive.js @@ -0,0 +1,18 @@ +angular.module('orderCloud') + //Single Spending Account Payment + .directive('ocPaymentSa', OrderCloudPaymentSpendingAccountDirective) +; + +function OrderCloudPaymentSpendingAccountDirective() { + return { + restrict:'E', + scope: { + order: '=', + payment: '=?', + excludedSpendingAccounts: '=?excludeOptions' + }, + templateUrl: 'checkout/payment/directives/templates/spendingAccount.html', + controller: 'PaymentSpendingAccountCtrl', + controllerAs: 'paymentSA' + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/payment.directives.js b/src/app/checkout/payment/directives/payment.directives.js index b3aed785..384ee9a8 100644 --- a/src/app/checkout/payment/directives/payment.directives.js +++ b/src/app/checkout/payment/directives/payment.directives.js @@ -1,381 +1,13 @@ -angular.module('orderCloud') - //Single Purchase Order Payment - .directive('ocPaymentPo', OCPaymentPurchaseOrder) - .controller('PaymentPurchaseOrderCtrl', PaymentPurchaseOrderController) - //Single Spending Account Payment - .directive('ocPaymentSa', OCPaymentSpendingAccount) - .controller('PaymentSpendingAccountCtrl', PaymentSpendingAccountController) - //Single Credit Card Payment - .directive('ocPaymentCc', OCPaymentCreditCard) - .controller('PaymentCreditCardCtrl', PaymentCreditCardController) - //Single Payment, Multiple Types - .directive('ocPayment', OCPayment) - .controller('PaymentCtrl', PaymentController) - //Multiple Payment, Multiple Types - .directive('ocPayments', OCPayments) - .controller('PaymentsCtrl', PaymentsController) -; -function OCPaymentPurchaseOrder() { - return { - restrict:'E', - scope: { - order: '=', - payment: '=?' - }, - templateUrl: 'checkout/payment/directives/templates/purchaseOrder.html', - controller: 'PaymentPurchaseOrderCtrl' - } -} -function PaymentPurchaseOrderController($scope, $rootScope, toastr, OrderCloud, $exceptionHandler) { - if (!$scope.payment) { - OrderCloud.Payments.List($scope.order.ID) - .then(function(data) { - if (data.Items.length) { - OrderCloud.Payments.Patch($scope.order.ID, data.Items[0].ID, { - Type: 'PurchaseOrder', - CreditCardID: null, - SpendingAccountID: null, - Amount: null - }).then(function(data) { - $scope.payment = data; - }); - } else { - OrderCloud.Payments.Create($scope.order.ID, {Type: 'PurchaseOrder'}) - .then(function(data) { - $scope.payment = data; - }); - } - }); - } else if (!($scope.payment.Type == "PurchaseOrder" && $scope.payment.CreditCardID == null && $scope.payment.SpendingAccountID == null)) { - $scope.payment.Type = "PurchaseOrder"; - $scope.payment.CreditCardID = null; - $scope.payment.SpendingAccountID = null; - OrderCloud.Payments.Patch($scope.order.ID, $scope.payment.ID, $scope.payment).then(function() { - toastr.success('Paying by purchase order', 'Purchase Order Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); - } - $scope.updatePayment = function() { - if ($scope.payment.xp && $scope.payment.xp.PONumber && (!$scope.payment.xp.PONumber.length)) $scope.payment.xp.PONumber = null; - OrderCloud.Payments.Update($scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - toastr.success('Purchase Order Number Saved'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - } -} -function OCPaymentSpendingAccount() { - return { - restrict:'E', - scope: { - order: '=', - payment: '=?', - excludedSpendingAccounts: '=?excludeOptions' - }, - templateUrl: 'checkout/payment/directives/templates/spendingAccount.html', - controller: 'PaymentSpendingAccountCtrl', - controllerAs: 'paymentSA' - } -} -function PaymentSpendingAccountController($scope, $rootScope, toastr, OrderCloud, $exceptionHandler) { - OrderCloud.Me.ListSpendingAccounts(null, 1, 100, null, null, {RedemptionCode: '!*', AllowAsPaymentMethod: true}) - .then(function(data) { - $scope.spendingAccounts = data.Items; - }); - if (!$scope.payment) { - OrderCloud.Payments.List($scope.order.ID) - .then(function(data) { - if (data.Items.length) { - OrderCloud.Payments.Patch($scope.order.ID, data.Items[0].ID, { - Type: 'SpendingAccount', - xp: { - PONumber:null - }, - CreditCardID:null, - SpendingAccountID:null, - Amount:null - }).then(function(data) { - $scope.payment = data; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; - }); - } else { - OrderCloud.Payments.Create($scope.order.ID, {Type: 'SpendingAccount'}) - .then(function(data) { - $scope.payment = data; - $scope.showPaymentOptions = true; - }); - } - }); - } else { - delete $scope.payment.CreditCardID; - if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; - } - $scope.changePayment = function() { - $scope.showPaymentOptions = true; - }; - - $scope.updatePayment = function(scope) { - var oldSelection = angular.copy($scope.payment.SpendingAccountID); - $scope.payment.SpendingAccountID = scope.spendingAccount.ID; - $scope.updatingSpendingAccountPayment = OrderCloud.Payments.Update($scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - $scope.showPaymentOptions = false; - toastr.success('Using ' + scope.spendingAccount.Name,'Spending Account Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $scope.payment.SpendingAccountID = oldSelection; - $exceptionHandler(ex); - }); - }; - - $scope.$watch('payment', function(n,o) { - if (n && !n.SpendingAccountID) { - $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', false); - } else { - $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', true); - } - }, true); -} - -function OCPaymentCreditCard() { - return { - restrict:'E', - scope: { - order: '=', - payment: '=?', - excludedCreditCards: '=?excludeOptions' - }, - templateUrl: 'checkout/payment/directives/templates/creditCard.html', - controller: 'PaymentCreditCardCtrl', - controllerAs: 'paymentCC' - } -} - -function PaymentCreditCardController($scope, $rootScope, toastr, $filter, OrderCloud, ocMyCreditCards, $exceptionHandler) { - OrderCloud.Me.ListCreditCards(null, 1, 100, null, null, {}) - .then(function(data) { - $scope.creditCards = data.Items; - }); - - if (!$scope.payment) { - OrderCloud.Payments.List($scope.order.ID) - .then(function(data) { - if (data.Items.length) { - OrderCloud.Payments.Patch($scope.order.ID, data.Items[0].ID, { - Type: 'CreditCard', - xp: { - PONumber: null - }, - SpendingAccountID: null, - Amount: null - }).then(function(data) { - $scope.payment = data; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; - }); - } else { - OrderCloud.Payments.Create($scope.order.ID, {Type: 'CreditCard'}) - .then(function(data) { - $scope.payment = data; - $scope.showPaymentOptions = true; - }); - } - }); - } else { - delete $scope.payment.SpendingAccountID; - if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; - if (!$scope.payment.CreditCardID) $scope.showPaymentOptions = true; - } - - $scope.changePayment = function() { - $scope.showPaymentOptions = true; - }; - - $scope.$watch('payment', function(n,o) { - if (n && !n.CreditCardID) { - $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', false); - } else { - $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', true); - - } - }, true); - - $scope.updatePayment = function(scope) { - var oldSelection = angular.copy($scope.payment.CreditCardID); - $scope.payment.CreditCardID = scope.creditCard.ID; - $scope.updatingCreditCardPayment = OrderCloud.Payments.Update($scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - $scope.showPaymentOptions = false; - toastr.success('Using ' + $filter('humanize')(scope.creditCard.CardType) + ' ending in ' + scope.creditCard.PartialAccountNumber,'Credit Card Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $scope.payment.CreditCardID = oldSelection; - $exceptionHandler(ex); - }); - }; - - $scope.createCreditCard = function() { - ocMyCreditCards.Create() - .then(function(card) { - toastr.success('Credit Card Created', 'Success'); - $scope.creditCards.push(card); - $scope.updatePayment({creditCard:card}); - }); - }; -} - -function OCPayment() { - return { - restrict:'E', - scope: { - order: '=', - methods: '=?', - payment: '=?', - paymentIndex: '=?', - excludeOptions: '=?' - }, - templateUrl: 'checkout/payment/directives/templates/payment.html', - controller: 'PaymentCtrl', - controllerAs: 'ocPayment' - } -} - -function PaymentController($scope, $rootScope, OrderCloud, CheckoutConfig) { - if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; - if (!$scope.payment) { - OrderCloud.Payments.List($scope.order.ID) - .then(function(data) { - if (CheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { - CheckoutPaymentService.RemoveAllPayments(data, $scope.order) - .then(function(data) { - OrderCloud.Payments.Create($scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payment = data; - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); - }); - } - else if (data.Items.length) { - $scope.payment = data.Items[0]; - if ($scope.methods.length == 1) $scope.payment.Type = $scope.methods[0]; - } else { - OrderCloud.Payments.Create($scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payment = data; - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); - } - }); - } else if ($scope.methods.length == 1) { - $scope.payment.Type = $scope.methods[0]; - } -} - -function OCPayments() { - return { - restrict:'E', - scope: { - order: '=', - methods: '=?' - }, - templateUrl: 'checkout/payment/directives/templates/payments.html', - controller: 'PaymentsCtrl' - } -} - -function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, OrderCloud, CheckoutPaymentService, CheckoutConfig) { - if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; - - OrderCloud.Payments.List($scope.order.ID) - .then(function(data) { - if (!data.Items.length) { - $scope.payments = {Items: []}; - $scope.addNewPayment(); - } - else if (CheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { - CheckoutPaymentService.RemoveAllPayments(data, $scope.order) - .then(function(data) { - $scope.payments = {Items: []}; - $scope.addNewPayment(); - }); - } - else { - $scope.payments = data; - calculateMaxTotal(); - } - }); - - $scope.addNewPayment = function() { - OrderCloud.Payments.Create($scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payments.Items.push(data); - calculateMaxTotal(); - toastr.success('Payment Added'); - }); - }; - - $scope.removePayment = function(scope) { - // TODO: when api bug EX-1053 is fixed refactor this to simply delete the payment - return OrderCloud.Payments.Patch($scope.order.ID, scope.payment.ID, {Type: 'PurchaseOrder', SpendingAccountID: null}) - .then(function() { - return OrderCloud.Payments.Delete($scope.order.ID, scope.payment.ID) - .then(function(){ - $scope.payments.Items.splice(scope.$index, 1); - calculateMaxTotal(); - return toastr.success('Payment Removed'); - }); - }); - }; - - $scope.updatePaymentAmount = function(scope) { - if (scope.payment.Amount > scope.payment.MaxAmount || !scope.payment.Amount) return; - OrderCloud.Payments.Update($scope.order.ID, scope.payment.ID, scope.payment) - .then(function(data) { - toastr.success('Payment Amount Updated'); - calculateMaxTotal(); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); - }; - - $rootScope.$on('OC:PaymentsUpdated', function() { - calculateMaxTotal(); - }); - - - function calculateMaxTotal() { - var paymentTotal = 0; - $scope.excludeOptions = { - SpendingAccounts: [], - CreditCards: [] - }; - angular.forEach($scope.payments.Items, function(payment) { - paymentTotal += payment.Amount; - if (payment.SpendingAccountID) $scope.excludeOptions.SpendingAccounts.push(payment.SpendingAccountID); - if (payment.CreditCardID) $scope.excludeOptions.CreditCards.push(payment.CreditCardID); - var maxAmount = $scope.order.Total - _.reduce(_.pluck($scope.payments.Items, 'Amount'), function(a, b) {return a + b; }); - payment.MaxAmount = (payment.Amount + maxAmount).toFixed(2); - }); - $scope.canAddPayment = paymentTotal < $scope.order.Total; - if($scope.OCPayments) $scope.OCPayments.$setValidity('Insufficient_Payment', !$scope.canAddPayment); - } -} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/creditCard.html b/src/app/checkout/payment/directives/templates/creditCard.html index 2153c235..616337ec 100644 --- a/src/app/checkout/payment/directives/templates/creditCard.html +++ b/src/app/checkout/payment/directives/templates/creditCard.html @@ -20,4 +20,7 @@ </div> </div> </div> + <div class="no-matches" ng-if="!creditCards.length"> + You have not created any personal credit cards. + </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/payments.html b/src/app/checkout/payment/directives/templates/payments.html index 0e3ee8b6..b180bf21 100644 --- a/src/app/checkout/payment/directives/templates/payments.html +++ b/src/app/checkout/payment/directives/templates/payments.html @@ -18,5 +18,5 @@ </div> <hr ng-if="!$last"> </div> - <button type="button" class="btn btn-block btn-default" ng-click="addNewPayment()" ng-if="canAddPayment">Add New Payment</button> + <button type="button" class="btn btn-block btn-default" ng-click="addNewPayment(true)" ng-if="canAddPayment">Add New Payment</button> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/spendingAccount.html b/src/app/checkout/payment/directives/templates/spendingAccount.html index a09ba30b..895b71d2 100644 --- a/src/app/checkout/payment/directives/templates/spendingAccount.html +++ b/src/app/checkout/payment/directives/templates/spendingAccount.html @@ -28,4 +28,7 @@ </div> </div> </div> + <div class="no-matches" ng-if="!spendingAccounts.length"> + You do not have any spending accounts available. + </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/js/payment.config.js b/src/app/checkout/payment/js/payment.config.js new file mode 100644 index 00000000..862e954b --- /dev/null +++ b/src/app/checkout/payment/js/payment.config.js @@ -0,0 +1,14 @@ +angular.module('orderCloud') + .config(checkoutPaymentConfig) +; + +function checkoutPaymentConfig($stateProvider) { + $stateProvider + .state('checkout.payment', { + url: '/payment', + templateUrl: 'checkout/payment/templates/checkout.payment.html', + controller: 'CheckoutPaymentCtrl', + controllerAs: 'checkoutPayment' + }) + ; +} \ No newline at end of file diff --git a/src/app/checkout/payment/js/payment.controller.js b/src/app/checkout/payment/js/payment.controller.js new file mode 100644 index 00000000..b635104b --- /dev/null +++ b/src/app/checkout/payment/js/payment.controller.js @@ -0,0 +1,42 @@ +angular.module('orderCloud') + .controller('CheckoutPaymentCtrl', CheckoutPaymentController) +; + +function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, sdkOrderCloud, ocAddressSelect, ocMyAddresses) { + var vm = this; + vm.createAddress = createAddress; + vm.changeBillingAddress = changeBillingAddress; + + function createAddress(order){ + return ocMyAddresses.Create() + .then(function(address) { + toastr.success('Address Created', 'Success'); + order.BillingAddressID = address.ID; + saveBillingAddress(order); + }); + } + + function changeBillingAddress(order) { + ocAddressSelect.Open('billing') + .then(function(address) { + if (address == 'create') { + createAddress(order); + } else { + order.BillingAddressID = address.ID; + saveBillingAddress(order); + } + }); + } + + function saveBillingAddress(order) { + if (order && order.BillingAddressID) { + sdkOrderCloud.Orders.Patch('outgoing', order.ID, {BillingAddressID: order.BillingAddressID}) + .then(function(updatedOrder) { + $rootScope.$broadcast('OC:OrderBillAddressUpdated', updatedOrder); + }) + .catch(function(ex) { + $exceptionHandler(ex); + }); + } + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/js/payment.service.js b/src/app/checkout/payment/js/payment.service.js new file mode 100644 index 00000000..058568a7 --- /dev/null +++ b/src/app/checkout/payment/js/payment.service.js @@ -0,0 +1,36 @@ +angular.module('orderCloud') + .factory('ocCheckoutPaymentService', OrderCloudCheckoutPaymentService) +; + +function OrderCloudCheckoutPaymentService($q, sdkOrderCloud) { + var service = { + PaymentsExceedTotal: _paymentsExceedTotal, + RemoveAllPayments: _removeAllPayments + }; + + function _paymentsExceedTotal(payments, orderTotal) { + var paymentTotal = 0; + angular.forEach(payments.Items, function(payment) { + paymentTotal += payment.Amount; + }); + + return paymentTotal.toFixed(2) > orderTotal; + } + + function _removeAllPayments(payments, order) { + var deferred = $q.defer(); + + var queue = []; + angular.forEach(payments.Items, function(payment) { + queue.push(sdkOrderCloud.Payments.Delete('outgoing', order.ID, payment.ID)); + }); + + $q.all(queue).then(function() { + deferred.resolve(); + }); + + return deferred.promise; + } + + return service; +} \ No newline at end of file diff --git a/src/app/checkout/review/checkout.review.js b/src/app/checkout/review/js/review.config.js similarity index 71% rename from src/app/checkout/review/checkout.review.js rename to src/app/checkout/review/js/review.config.js index d7175c95..fd586624 100644 --- a/src/app/checkout/review/checkout.review.js +++ b/src/app/checkout/review/js/review.config.js @@ -1,8 +1,8 @@ angular.module('orderCloud') - .config(checkoutReviewConfig) - .controller('CheckoutReviewCtrl', CheckoutReviewController); + .config(CheckoutReviewConfig) +; -function checkoutReviewConfig($stateProvider) { +function CheckoutReviewConfig($stateProvider) { $stateProvider .state('checkout.review', { url: '/review', @@ -10,9 +10,9 @@ function checkoutReviewConfig($stateProvider) { controller: 'CheckoutReviewCtrl', controllerAs: 'checkoutReview', resolve: { - LineItemsList: function($q, $state, toastr, OrderCloud, ocLineItems, CurrentOrder) { + LineItemsList: function($q, $state, toastr, sdkOrderCloud, ocLineItems, CurrentOrder) { var dfd = $q.defer(); - OrderCloud.LineItems.List(CurrentOrder.ID) + sdkOrderCloud.LineItems.List('outgoing', CurrentOrder.ID, {pageSize: 100}) .then(function(data) { if (!data.Items.length) { dfd.resolve(data); @@ -30,8 +30,8 @@ function checkoutReviewConfig($stateProvider) { }); return dfd.promise; }, - OrderPaymentsDetail: function($q, OrderCloud, CurrentOrder, $state) { - return OrderCloud.Payments.List(CurrentOrder.ID) + OrderPaymentsDetail: function($q, sdkOrderCloud, CurrentOrder, $state) { + return sdkOrderCloud.Payments.List('outgoing', CurrentOrder.ID) .then(function(data) { //TODO: create a queue that can be resolved var dfd = $q.defer(); @@ -44,7 +44,7 @@ function checkoutReviewConfig($stateProvider) { if (payment.Type === 'CreditCard' && payment.CreditCardID) { queue.push((function() { var d = $q.defer(); - OrderCloud.Me.GetCreditCard(payment.CreditCardID) + sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -55,7 +55,7 @@ function checkoutReviewConfig($stateProvider) { if (payment.Type === 'SpendingAccount' && payment.SpendingAccountID) { queue.push((function() { var d = $q.defer(); - OrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) .then(function(sa) { data.Items[index].Details = sa; d.resolve(); @@ -69,15 +69,8 @@ function checkoutReviewConfig($stateProvider) { dfd.resolve(data); }); return dfd.promise; - }) - + }); } } }); -} - -function CheckoutReviewController(LineItemsList, OrderPaymentsDetail) { - var vm = this; - vm.payments = OrderPaymentsDetail; - vm.lineItems = LineItemsList; } \ No newline at end of file diff --git a/src/app/checkout/review/js/review.controller.js b/src/app/checkout/review/js/review.controller.js new file mode 100644 index 00000000..38eeb3f9 --- /dev/null +++ b/src/app/checkout/review/js/review.controller.js @@ -0,0 +1,9 @@ +angular.module('orderCloud') + .controller('CheckoutReviewCtrl', CheckoutReviewController) +; + +function CheckoutReviewController(LineItemsList, OrderPaymentsDetail) { + var vm = this; + vm.payments = OrderPaymentsDetail; + vm.lineItems = LineItemsList; +} \ No newline at end of file diff --git a/src/app/checkout/shipping/js/shipping.config.js b/src/app/checkout/shipping/js/shipping.config.js new file mode 100644 index 00000000..4f5bf744 --- /dev/null +++ b/src/app/checkout/shipping/js/shipping.config.js @@ -0,0 +1,13 @@ +angular.module('orderCloud') + .config(CheckoutShippingConfig) +; + +function CheckoutShippingConfig($stateProvider) { + $stateProvider + .state('checkout.shipping', { + url: '/shipping', + templateUrl: 'checkout/shipping/templates/checkout.shipping.html', + controller: 'CheckoutShippingCtrl', + controllerAs: 'checkoutShipping' + }); +} \ No newline at end of file diff --git a/src/app/checkout/shipping/checkout.shipping.js b/src/app/checkout/shipping/js/shipping.controller.js similarity index 72% rename from src/app/checkout/shipping/checkout.shipping.js rename to src/app/checkout/shipping/js/shipping.controller.js index 74f16897..d7209746 100644 --- a/src/app/checkout/shipping/checkout.shipping.js +++ b/src/app/checkout/shipping/js/shipping.controller.js @@ -1,18 +1,8 @@ angular.module('orderCloud') - .config(checkoutShippingConfig) - .controller('CheckoutShippingCtrl', CheckoutShippingController); + .controller('CheckoutShippingCtrl', CheckoutShippingController) +; -function checkoutShippingConfig($stateProvider) { - $stateProvider - .state('checkout.shipping', { - url: '/shipping', - templateUrl: 'checkout/shipping/templates/checkout.shipping.html', - controller: 'CheckoutShippingCtrl', - controllerAs: 'checkoutShipping' - }); -} - -function CheckoutShippingController($exceptionHandler, $rootScope, toastr, OrderCloud, ocMyAddresses, AddressSelectModal, ShippingRates, CheckoutConfig) { +function CheckoutShippingController($exceptionHandler, $rootScope, toastr, sdkOrderCloud, ocMyAddresses, ocAddressSelect, ocShippingRates, CheckoutConfig) { var vm = this; vm.createAddress = createAddress; vm.changeShippingAddress = changeShippingAddress; @@ -32,7 +22,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, Order } function changeShippingAddress(order) { - AddressSelectModal.Open('shipping') + ocAddressSelect.Open('shipping') .then(function(address) { if (address == 'create') { vm.createAddress(order); @@ -45,7 +35,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, Order function saveShipAddress(order) { if (order && order.ShippingAddressID) { - OrderCloud.Orders.Patch(order.ID, {ShippingAddressID: order.ShippingAddressID}) + sdkOrderCloud.Orders.Patch('outgoing', order.ID, {ShippingAddressID: order.ShippingAddressID}) .then(function(updatedOrder) { $rootScope.$broadcast('OC:OrderShipAddressUpdated', updatedOrder); vm.getShippingRates(order); @@ -62,7 +52,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, Order function getShippingRates(order) { vm.shippersAreLoading = true; - vm.shippersLoading = ShippingRates.GetRates(order) + vm.shippersLoading = ocShippingRates.GetRates(order) .then(function(shipments) { vm.shippersAreLoading = false; vm.shippingRates = shipments; @@ -71,11 +61,11 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, Order } function analyzeShipments(order) { - vm.shippingRates = ShippingRates.AnalyzeShipments(order, vm.shippingRates); + vm.shippingRates = ocShippingRates.AnalyzeShipments(order, vm.shippingRates); } function shipperSelected(order) { - ShippingRates.ManageShipments(order, vm.shippingRates) + ocShippingRates.ManageShipments(order, vm.shippingRates) .then(function() { $rootScope.$broadcast('OC:UpdateOrder', order.ID); }); diff --git a/src/app/checkout/shipping/checkout.shipping.rates.js b/src/app/checkout/shipping/js/shippingRates.service.js similarity index 84% rename from src/app/checkout/shipping/checkout.shipping.rates.js rename to src/app/checkout/shipping/js/shippingRates.service.js index 0dc8bb62..8b05a778 100644 --- a/src/app/checkout/shipping/checkout.shipping.rates.js +++ b/src/app/checkout/shipping/js/shippingRates.service.js @@ -1,8 +1,8 @@ angular.module('orderCloud') - .factory('ShippingRates', ShippingRatesService) + .factory('ocShippingRates', OrderCloudShippingRatesService) ; -function ShippingRatesService($q, $resource, OrderCloud, apiurl) { +function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, buyerid) { var service = { GetRates: _getRates, GetLineItemRates: _getLineItemRates, @@ -17,12 +17,12 @@ function ShippingRatesService($q, $resource, OrderCloud, apiurl) { var deferred = $q.defer(); var request = { - BuyerID: OrderCloud.BuyerID.Get(), + BuyerID: buyerid, TransactionType: 'GetRates', OrderID: order.ID }; - $resource(shippingRatesURL, {}, {getrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloud.Auth.ReadToken()}}}).getrates(request).$promise + $resource(shippingRatesURL, {}, {getrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).getrates(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody.Shipments); }) @@ -37,12 +37,12 @@ function ShippingRatesService($q, $resource, OrderCloud, apiurl) { var deferred = $q.defer(); var request = { - BuyerID: OrderCloud.BuyerID.Get(), + BuyerID: buyerid, TransactionType: 'GetLineItemRates', OrderID: order.ID }; - $resource(shippingRatesURL, {}, {getlineitemrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloud.Auth.ReadToken()}}}).getlineitemrates(request).$promise + $resource(shippingRatesURL, {}, {getlineitemrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).getlineitemrates(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody.Shipments); }) @@ -57,13 +57,13 @@ function ShippingRatesService($q, $resource, OrderCloud, apiurl) { var deferred = $q.defer(); var request = { - BuyerID: OrderCloud.BuyerID.Get(), + BuyerID: buyerid, TransactionType: 'SetShippingCost', OrderID: order.ID, ShippingCost: cost }; - $resource(shippingRatesURL, {}, {setshippingcost: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloud.Auth.ReadToken()}}}).setshippingcost(request).$promise + $resource(shippingRatesURL, {}, {setshippingcost: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).setshippingcost(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody); }) @@ -91,7 +91,7 @@ function ShippingRatesService($q, $resource, OrderCloud, apiurl) { } }); - OrderCloud.Orders.Patch(order.ID, {xp: xpPatch}) + sdkOrderCloud.Orders.Patch('outgoing', order.ID, {xp: xpPatch}) .then(function() { updateShippingCost(); }) From 5cebc38180b2f4c88d59dd550222867632731503 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 18:09:18 -0500 Subject: [PATCH 073/158] SDK Update: Approvals --- src/app/myOrders/approvals/js/approvals.config.js | 8 ++++++-- src/app/myOrders/approvals/js/approvals.controller.js | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/myOrders/approvals/js/approvals.config.js b/src/app/myOrders/approvals/js/approvals.config.js index 232a5e55..1b30243c 100644 --- a/src/app/myOrders/approvals/js/approvals.config.js +++ b/src/app/myOrders/approvals/js/approvals.config.js @@ -16,8 +16,12 @@ function ApprovalsConfig($stateProvider){ OrderApprovals: function($stateParams, ocApprovals) { return ocApprovals.List($stateParams.orderid, $stateParams.buyerid, 1, 100); }, - CanApprove: function(CurrentUser, $stateParams, OrderCloud){ - return OrderCloud.Orders.ListEligibleApprovers($stateParams.orderid, null, 1, 100) + CanApprove: function(CurrentUser, $stateParams, sdkOrderCloud){ + var parameters = { + page: 1, + pageSize: 100 + }; + return sdkOrderCloud.Orders.ListEligibleApprovers('outgoing', $stateParams.orderid, parameters) .then(function(userList){ var userIDs = _.pluck(userList.Items, 'ID'); return userIDs.indexOf(CurrentUser.ID) > -1; diff --git a/src/app/myOrders/approvals/js/approvals.controller.js b/src/app/myOrders/approvals/js/approvals.controller.js index 8363329b..3deaa26c 100644 --- a/src/app/myOrders/approvals/js/approvals.controller.js +++ b/src/app/myOrders/approvals/js/approvals.controller.js @@ -30,7 +30,7 @@ function OrderApprovalsController($stateParams, OrderCloud, ocApprovals, OrderAp }; } -function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalInstance, OrderCloud, toastr){ +function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalInstance, sdkOrderCloud, toastr){ var vm = this; vm.intent = Intent; // 'Approve' or 'Decline' vm.orderid = OrderID; @@ -44,7 +44,7 @@ function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalIn } function submit(){ - return OrderCloud.Orders[vm.intent](vm.orderid, vm.comments) + return sdkOrderCloud.Orders[vm.intent]('outgoing', vm.orderid, {comments: vm.comments}) .then(function(){ toastr.success('Order ' + vm.intent + 'd'); $uibModalInstance.close(); From 37268047ae128542eef726cc0912fe97bbf20695 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Wed, 5 Apr 2017 18:16:10 -0500 Subject: [PATCH 074/158] SDK Update: Repeat Order --- .../repeatOrder/js/repeatOrder.component.js | 16 +++ .../repeatOrder/js/repeatOrder.controller.js | 28 ++++ .../js/repeatOrder.modal.controller.js | 26 ++++ src/app/repeatOrder/js/repeatOrder.service.js | 85 ++++++++++++ src/app/repeatOrder/repeatOrder.js | 128 +----------------- 5 files changed, 156 insertions(+), 127 deletions(-) create mode 100644 src/app/repeatOrder/js/repeatOrder.component.js create mode 100644 src/app/repeatOrder/js/repeatOrder.controller.js create mode 100644 src/app/repeatOrder/js/repeatOrder.modal.controller.js create mode 100644 src/app/repeatOrder/js/repeatOrder.service.js diff --git a/src/app/repeatOrder/js/repeatOrder.component.js b/src/app/repeatOrder/js/repeatOrder.component.js new file mode 100644 index 00000000..bad8c882 --- /dev/null +++ b/src/app/repeatOrder/js/repeatOrder.component.js @@ -0,0 +1,16 @@ +angular.module('orderCloud') + .component('ordercloudRepeatOrder', OrderCloudRepeatOrderComponent()) +; + +function OrderCloudRepeatOrderComponent() { + var component = { + templateUrl: 'repeatOrder/templates/repeatOrder.component.html', + controller: 'RepeatOrderCtrl', + bindings: { + currentOrderId: '<', + originalOrderId: '<' + } + }; + + return component; +} \ No newline at end of file diff --git a/src/app/repeatOrder/js/repeatOrder.controller.js b/src/app/repeatOrder/js/repeatOrder.controller.js new file mode 100644 index 00000000..f402df3f --- /dev/null +++ b/src/app/repeatOrder/js/repeatOrder.controller.js @@ -0,0 +1,28 @@ +angular.module('orderCloud') + .controller('RepeatOrderCtrl', RepeatOrderCtrl) +; + +function RepeatOrderCtrl(toastr, ocRepeatOrder, $uibModal) { + var vm = this; + + vm.$onInit = function() { + if (vm.orderid === 'undefined') toastr.error('repeat order component is not configured correctly. orderid is a required attribute', 'Error'); + }; + + vm.openReorderModal = function(){ + $uibModal.open({ + templateUrl: 'repeatOrder/templates/repeatOrder.modal.html', + controller: 'RepeatOrderModalCtrl', + controllerAs: 'repeatModal', + size: 'md', + resolve: { + OrderID: function() { + return vm.currentOrderId; + }, + LineItems: function() { + return ocRepeatOrder.GetValidLineItems(vm.originalOrderId); + } + } + }); + }; +} \ No newline at end of file diff --git a/src/app/repeatOrder/js/repeatOrder.modal.controller.js b/src/app/repeatOrder/js/repeatOrder.modal.controller.js new file mode 100644 index 00000000..4ca46946 --- /dev/null +++ b/src/app/repeatOrder/js/repeatOrder.modal.controller.js @@ -0,0 +1,26 @@ +angular.module('orderCloud') + .controller('RepeatOrderModalCtrl', RepeatOrderModalCtrl) +; + +function RepeatOrderModalCtrl(LineItems, OrderID, $uibModalInstance, $state, ocRepeatOrder){ + var vm = this; + vm.orderid = OrderID; + vm.invalidLI = LineItems.invalid; + vm.validLI = LineItems.valid; + + + vm.cancel = function(){ + $uibModalInstance.dismiss(); + }; + + vm.submit = function(){ + vm.loading = { + message:'Adding Products to Cart' + }; + vm.loading.promise = ocRepeatOrder.AddLineItemsToCart(vm.validLI, vm.orderid) + .then(function(){ + $uibModalInstance.close(); + $state.go('cart', {}, {reload: true}); + }); + }; +} \ No newline at end of file diff --git a/src/app/repeatOrder/js/repeatOrder.service.js b/src/app/repeatOrder/js/repeatOrder.service.js new file mode 100644 index 00000000..60aa9809 --- /dev/null +++ b/src/app/repeatOrder/js/repeatOrder.service.js @@ -0,0 +1,85 @@ +angular.module('orderCloud') + .factory('ocRepeatOrder', OrderCloudRepeatOrderService) +; + +function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, sdkOrderCloud, ocLineItems, catalogid) { + return { + GetValidLineItems: getValidLineItems, + AddLineItemsToCart: addLineItemsToCart + }; + + function getValidLineItems(originalOrderID) { + var dfd = $q.defer(); + ListAllMeProducts() + .then(function(productList) { + var productIds = _.pluck(productList, 'ID'); + ocLineItems.ListAll(originalOrderID) + .then(function(lineItemList) { + lineItemList.ProductIds = productIds; + var valid = []; + var invalid = []; + angular.forEach(lineItemList, function(li) { + productIds.indexOf(li.ProductID) > -1 ? valid.push(li) : invalid.push(li); + }); + dfd.resolve({valid: valid, invalid: invalid}); + }); + }); + return dfd.promise; + + function ListAllMeProducts() { + var dfd = $q.defer(); + var queue = []; + var options = { + catalogID: catalogid, + page: 1, + pageSize: 100 + }; + sdkOrderCloud.Me.ListProducts(options) + .then(function(data) { + var productList = data; + if (data.Meta.TotalPages > data.Meta.Page) { + var page = data.Meta.Page; + while (page < data.Meta.TotalPages) { + page++; + options.page = page; + queue.push(sdkOrderCloud.Me.ListProducts(options)); + } + } + $q.all(queue) + .then(function(results) { + angular.forEach(results, function(result) { + productList.Items = [].concat(productList.Items, result.Items); + }); + dfd.resolve(productList.Items); + }) + .catch(function(err) { + dfd.reject(err); + }); + }); + return dfd.promise; + } + } + + function addLineItemsToCart(validLI, orderID) { + var queue = []; + var dfd = $q.defer(); + angular.forEach(validLI, function(li){ + var lineItemToAdd = { + ProductID: li.ProductID, + Quantity: li.Quantity, + Specs: li.Specs + }; + queue.push(sdkOrderCloud.LineItems.Create('outgoing', orderID, lineItemToAdd)); + }); + $q.all(queue) + .then(function(){ + dfd.resolve(); + toastr.success('Product(s) Add to Cart', 'Success'); + }) + .catch(function(error){ + $exceptionHandler(error); + dfd.reject(error); + }); + return dfd.promise; + } +} \ No newline at end of file diff --git a/src/app/repeatOrder/repeatOrder.js b/src/app/repeatOrder/repeatOrder.js index 0b4f2b96..287072b9 100644 --- a/src/app/repeatOrder/repeatOrder.js +++ b/src/app/repeatOrder/repeatOrder.js @@ -2,135 +2,9 @@ angular.module('orderCloud') .factory('RepeatOrderFactory', RepeatOrderFactory) .controller('RepeatOrderCtrl', RepeatOrderCtrl) .controller('RepeatOrderModalCtrl', RepeatOrderModalCtrl) - .component('ordercloudRepeatOrder', { - templateUrl: 'repeatOrder/templates/repeatOrder.component.html', - controller: RepeatOrderCtrl, - bindings: { - currentOrderId: '<', - originalOrderId: '<' - } - }); +; -function RepeatOrderCtrl(toastr, RepeatOrderFactory, $uibModal) { - var vm = this; - vm.$onInit = function() { - if (vm.orderid === 'undefined') toastr.error('repeat order component is not configured correctly. orderid is a required attribute', 'Error'); - }; - vm.openReorderModal = function(){ - $uibModal.open({ - templateUrl: 'repeatOrder/templates/repeatOrder.modal.html', - controller: RepeatOrderModalCtrl, - controllerAs: 'repeatModal', - size: 'md', - resolve: { - OrderID: function() { - return vm.currentOrderId; - }, - LineItems: function() { - return RepeatOrderFactory.GetValidLineItems(vm.originalOrderId); - } - } - }); - }; -} -function RepeatOrderModalCtrl(LineItems, OrderID, $uibModalInstance, $state, RepeatOrderFactory){ - var vm = this; - vm.orderid = OrderID; - vm.invalidLI = LineItems.invalid; - vm.validLI = LineItems.valid; - - vm.cancel = function(){ - $uibModalInstance.dismiss(); - }; - - vm.submit = function(){ - vm.loading = { - message:'Adding Products to Cart' - }; - vm.loading.promise = RepeatOrderFactory.AddLineItemsToCart(vm.validLI, vm.orderid) - .then(function(){ - $uibModalInstance.close(); - $state.go('cart', {}, {reload: true}); - }); - }; -} - -function RepeatOrderFactory($q, $rootScope, toastr, $exceptionHandler, OrderCloud, ocLineItems) { - return { - GetValidLineItems: getValidLineItems, - AddLineItemsToCart: addLineItemsToCart - }; - - function getValidLineItems(originalOrderID) { - var dfd = $q.defer(); - ListAllMeProducts() - .then(function(productList) { - var productIds = _.pluck(productList, 'ID'); - ocLineItems.ListAll(originalOrderID) - .then(function(lineItemList) { - lineItemList.ProductIds = productIds; - var valid = []; - var invalid = []; - angular.forEach(lineItemList, function(li) { - productIds.indexOf(li.ProductID) > -1 ? valid.push(li) : invalid.push(li); - }); - dfd.resolve({valid: valid, invalid: invalid}); - }); - }); - return dfd.promise; - - function ListAllMeProducts() { - var dfd = $q.defer(); - var queue = []; - OrderCloud.Me.ListProducts(null, 1, 100) - .then(function(data) { - var productList = data; - if (data.Meta.TotalPages > data.Meta.Page) { - var page = data.Meta.Page; - while (page < data.Meta.TotalPages) { - page += 1; - queue.push(OrderCloud.Me.ListProducts(null, page, 100)); - } - } - $q.all(queue) - .then(function(results) { - angular.forEach(results, function(result) { - productList.Items = [].concat(productList.Items, result.Items); - }); - dfd.resolve(productList.Items); - }) - .catch(function(err) { - dfd.reject(err); - }); - }); - return dfd.promise; - } - } - - function addLineItemsToCart(validLI, orderID) { - var queue = []; - var dfd = $q.defer(); - angular.forEach(validLI, function(li){ - var lineItemToAdd = { - ProductID: li.ProductID, - Quantity: li.Quantity, - Specs: li.Specs - }; - queue.push(OrderCloud.LineItems.Create(orderID, lineItemToAdd)); - }); - $q.all(queue) - .then(function(){ - dfd.resolve(); - toastr.success('Product(s) Add to Cart', 'Success'); - }) - .catch(function(error){ - $exceptionHandler(error); - dfd.reject(error); - }); - return dfd.promise; - } -} \ No newline at end of file From 1a8a1ac9e261acab8cbbb01796b61cb7e5da30ab Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 08:53:51 -0500 Subject: [PATCH 075/158] Favorite Orders and Repeat Order updates --- src/app/favoriteOrders/js/favoriteOrders.component.js | 2 +- src/app/repeatOrder/repeatOrder.js | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/app/repeatOrder/repeatOrder.js diff --git a/src/app/favoriteOrders/js/favoriteOrders.component.js b/src/app/favoriteOrders/js/favoriteOrders.component.js index 320e89be..a1012890 100644 --- a/src/app/favoriteOrders/js/favoriteOrders.component.js +++ b/src/app/favoriteOrders/js/favoriteOrders.component.js @@ -16,7 +16,7 @@ function OrderCloudFavoriteOrderComponent() { return component; } -function FavoriteOrderCtrl(toastr, sdkOrderCloud){ +function FavoriteOrderController(toastr, sdkOrderCloud){ var vm = this; vm.$onInit = function(){ vm.hasFavorites = !!vm.currentUser && !!vm.currentUser.xp && !!vm.currentUser.xp.FavoriteOrders; diff --git a/src/app/repeatOrder/repeatOrder.js b/src/app/repeatOrder/repeatOrder.js deleted file mode 100644 index 287072b9..00000000 --- a/src/app/repeatOrder/repeatOrder.js +++ /dev/null @@ -1,10 +0,0 @@ -angular.module('orderCloud') - .factory('RepeatOrderFactory', RepeatOrderFactory) - .controller('RepeatOrderCtrl', RepeatOrderCtrl) - .controller('RepeatOrderModalCtrl', RepeatOrderModalCtrl) -; - - - - - From c1b441e996695afd093a28f099444217e949d6db Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 11:19:09 -0500 Subject: [PATCH 076/158] Breaking Changes Update: Checkout Payments - Single payment currently supported --- .../directives/js/creditCard.controller.js | 73 +++++++++------- .../directives/js/payment.controller.js | 77 ++++++++++++++--- .../directives/js/payments.controller.js | 38 +++++---- .../directives/js/purchaseOrder.controller.js | 42 +++------ .../js/spendingAccount.controller.js | 85 +++++++++---------- .../directives/templates/creditCard.html | 33 ++++++- .../payment/directives/templates/payment.html | 13 +-- .../directives/templates/purchaseOrder.html | 20 ++++- .../directives/templates/spendingAccount.html | 19 ++++- .../payment/templates/checkout.payment.html | 2 +- 10 files changed, 258 insertions(+), 144 deletions(-) diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js index 4deb6611..a42d6312 100644 --- a/src/app/checkout/payment/directives/js/creditCard.controller.js +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -16,30 +16,44 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { - Type: 'CreditCard', - xp: { - PONumber: null - }, - SpendingAccountID: null, - Amount: null - }).then(function(data) { - $scope.payment = data; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; - }); + $scope.payment = data.Items[0]; + $scope.showPaymentOptions = false; + getCreditCards(); } else { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'CreditCard'}) - .then(function(data) { - $scope.payment = data; - $scope.showPaymentOptions = true; - }); + var payment = { + Type: CheckoutConfig.AvailablePaymentMethods[0], + DateCreated: new Date().toISOString(), + CreditCardID: null, + SpendingAccountID: null, + Description: null, + Amount: $scope.order.Total, + Accepted: false, + xp: {} + }; + $scope.payment = payment; + getCreditCards(); } }); } else { delete $scope.payment.SpendingAccountID; if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; - if (!$scope.payment.CreditCardID) $scope.showPaymentOptions = true; + getCreditCards(); + } + + function getCreditCards() { + var creditCardListOptions = { + page: 1, + pageSize: 100 + }; + sdkOrderCloud.Me.ListCreditCards(creditCardListOptions) + .then(function(data) { + $scope.creditCards = data.Items; + if ($scope.payment.CreditCardID) { + $scope.payment.CreditCard = _.findWhere($scope.creditCards, {ID: $scope.payment.CreditCardID}); + } else { + $scope.showPaymentOptions = true; + } + }); } $scope.changePayment = function() { @@ -47,28 +61,21 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand }; $scope.$watch('payment', function(n,o) { - if (n && !n.CreditCardID) { - $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', false); + if (n && !n.CreditCardID || n.Editing) { + $scope.OCPaymentCreditCard.$setValidity('CreditCardNotSet', false); } else { - $scope.OCPaymentCreditCard.$setValidity('CreditCard_Not_Set', true); + $scope.OCPaymentCreditCard.$setValidity('CreditCardNotSet', true); } + + if (n.CreditCardID) n.CreditCard = _.findWhere($scope.creditCards, {ID: $scope.payment.CreditCardID}); + $scope.showPaymentOptions = n.Editing; + if (n.SpendingAccountID) delete n.SpendingAccountID; + if (n.xp && n.xp.PONumber) delete n.xp.PONumber; }, true); $scope.updatePayment = function(scope) { - var oldSelection = angular.copy($scope.payment.CreditCardID); $scope.payment.CreditCardID = scope.creditCard.ID; - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - $scope.updatingCreditCardPayment = sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - $scope.showPaymentOptions = false; - toastr.success('Using ' + $filter('humanize')(scope.creditCard.CardType) + ' ending in ' + scope.creditCard.PartialAccountNumber,'Credit Card Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $scope.payment.CreditCardID = oldSelection; - $exceptionHandler(ex); - }); }; $scope.createCreditCard = function() { diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js index 56a625fb..869f3d23 100644 --- a/src/app/checkout/payment/directives/js/payment.controller.js +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -10,25 +10,82 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS if (ocCheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { ocCheckoutPaymentService.RemoveAllPayments(data, $scope.order) .then(function(data) { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payment = data; - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); + var payment = { + Type: CheckoutConfig.AvailablePaymentMethods[0], + DateCreated: new Date().toISOString(), + CreditCardID: null, + SpendingAccountID: null, + Description: null, + Amount: $scope.order.Total, + Accepted: false, + xp: {} + }; + $scope.payment = payment; }); } else if (data.Items.length) { $scope.payment = data.Items[0]; if ($scope.methods.length == 1) $scope.payment.Type = $scope.methods[0]; } else { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payment = data; - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); + var payment = { + Type: CheckoutConfig.AvailablePaymentMethods[0], + DateCreated: new Date().toISOString(), + CreditCardID: null, + SpendingAccountID: null, + Description: null, + Amount: $scope.order.Total, + Accepted: false, + xp: {} + }; + $scope.payment = payment; } }); } else if ($scope.methods.length == 1) { $scope.payment.Type = $scope.methods[0]; } + + $scope.savePayment = function(payment, object) { + if (payment.ID) { + sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, payment.ID) + .then(function() { + delete payment.ID; + createPayment(payment); + }); + } else { + createPayment(payment); + } + + function createPayment(newPayment) { + sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, newPayment) + .then(function(data) { + data.Editing = false; + $scope.OCPayment.$setValidity('ValidPayment', true); + if (data.SpendingAccountID) data.SpendingAccount = object; + if (data.CreditCardID) data.CreditCard = object; + $scope.payment = data; + }); + } + }; + + $scope.paymentValid = function(payment) { + if (!payment || payment.Amount != $scope.order.Total) return false; //TODO: refactor for multiple payments + + var valid = false; + + switch(payment.Type) { + case 'CreditCard': + valid = payment.CreditCardID != null; + break; + case 'SpendingAccount': + valid = payment.SpendingAccountID != null; + break; + case 'PurchaseOrder': + valid = true; + break; + } + + $scope.OCPayment.$setValidity('ValidPayment', (valid && !payment.Editing)); + + return valid; + }; } \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/payments.controller.js b/src/app/checkout/payment/directives/js/payments.controller.js index adb913f5..e56d0fd6 100644 --- a/src/app/checkout/payment/directives/js/payments.controller.js +++ b/src/app/checkout/payment/directives/js/payments.controller.js @@ -2,6 +2,8 @@ angular.module('orderCloud') .controller('PaymentsCtrl', PaymentsController) ; +//TODO: Refactor for multiple payments without Payments.Patch + function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; @@ -25,31 +27,35 @@ function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOr }); $scope.addNewPayment = function(notify) { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: CheckoutConfig.AvailablePaymentMethods[0]}) - .then(function(data) { - $scope.payments.Items.push(data); - calculateMaxTotal(); - if (notify) toastr.success('Payment Added'); - }); + var paymentTotal = $scope.order.Total - _.reduce($scope.payments.Items, function(sum, payment) { return payment.Amount + sum; }, 0); + var payment = { + Type: CheckoutConfig.AvailablePaymentMethods[0], + DateCreated: new Date().toISOString(), + CreditCardID: null, + SpendingAccountID: null, + Description: null, + Amount: paymentTotal, + Accepted: false, + xp: {} + }; + $scope.payments.Items.push(payment); + calculateMaxTotal(); }; $scope.removePayment = function(scope) { // TODO: when api bug EX-1053 is fixed refactor this to simply delete the payment - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - return sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, {Type: 'PurchaseOrder', SpendingAccountID: null}) - .then(function() { - return sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, scope.payment.ID) - .then(function(){ - $scope.payments.Items.splice(scope.$index, 1); - calculateMaxTotal(); - return toastr.success('Payment Removed'); - }); + + return sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, scope.payment.ID) + .then(function(){ + $scope.payments.Items.splice(scope.$index, 1); + calculateMaxTotal(); + return toastr.success('Payment Removed'); }); }; $scope.updatePaymentAmount = function(scope) { if (scope.payment.Amount > scope.payment.MaxAmount || !scope.payment.Amount) return; - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor + //TODO: Buyer Users currently cannot patch a payment - we need to refactor for multiple payments sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, scope.payment) .then(function(data) { toastr.success('Payment Amount Updated'); diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js index e490e6d4..bf09cf0d 100644 --- a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -7,43 +7,27 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { + $scope.payment.Items[0]; + } else { + var payment = { Type: 'PurchaseOrder', + DateCreated: new Date().toISOString(), CreditCardID: null, SpendingAccountID: null, - Amount: null - }).then(function(data) { - $scope.payment = data; - }); - } else { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'PurchaseOrder'}) - .then(function(data) { - $scope.payment = data; - }); + Description: null, + Amount: $scope.order.Total, + Accepted: false, + xp: {} + }; + $scope.payment = payment; } }); } else if (!($scope.payment.Type == "PurchaseOrder" && $scope.payment.CreditCardID == null && $scope.payment.SpendingAccountID == null)) { $scope.payment.Type = "PurchaseOrder"; $scope.payment.CreditCardID = null; $scope.payment.SpendingAccountID = null; - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment).then(function() { - toastr.success('Paying by purchase order', 'Purchase Order Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }); - } - - $scope.updatePayment = function() { - if ($scope.payment.xp && $scope.payment.xp.PONumber && (!$scope.payment.xp.PONumber.length)) $scope.payment.xp.PONumber = null; - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - toastr.success('Purchase Order Number Saved'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $exceptionHandler(ex); - }); + } else { + $scope.payment.CreditCardID = null; + $scope.payment.SpendingAccountID = null; } } \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/spendingAccount.controller.js b/src/app/checkout/payment/directives/js/spendingAccount.controller.js index 95e8f545..12388ffe 100644 --- a/src/app/checkout/payment/directives/js/spendingAccount.controller.js +++ b/src/app/checkout/payment/directives/js/spendingAccount.controller.js @@ -3,45 +3,49 @@ angular.module('orderCloud') ; function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud) { - var spendingAccountListOptions = { - page: 1, - pageSize: 100, - filters: {RedemptionCode: '!*', AllowAsPaymentMethod: true} - }; - sdkOrderCloud.Me.ListSpendingAccounts(spendingAccountListOptions) - .then(function(data) { - $scope.spendingAccounts = data.Items; - }); - if (!$scope.payment) { sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, data.Items[0].ID, { - Type: 'SpendingAccount', - xp: { - PONumber:null - }, - CreditCardID:null, - SpendingAccountID:null, - Amount:null - }).then(function(data) { - $scope.payment = data; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; - }); + $scope.payment = data.Items[0]; + $scope.showPaymentOptions = false; + getSpendingAccounts(); } else { - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, {Type: 'SpendingAccount'}) - .then(function(data) { - $scope.payment = data; - $scope.showPaymentOptions = true; - }); + var payment = { + Type: 'SpendingAccount', + DateCreated: new Date().toISOString(), + CreditCardID: null, + SpendingAccountID: null, + Description: null, + Amount: $scope.order.Total, + Accepted: false, + xp: {} + }; + $scope.payment = payment; + getSpendingAccounts(); } }); } else { delete $scope.payment.CreditCardID; if ($scope.payment.xp && $scope.payment.xp.PONumber) $scope.payment.xp.PONumber = null; - if (!$scope.payment.SpendingAccountID) $scope.showPaymentOptions = true; + getSpendingAccounts(); + } + + function getSpendingAccounts() { + var spendingAccountListOptions = { + page: 1, + pageSize: 100, + filters: {RedemptionCode: '!*', AllowAsPaymentMethod: true} + }; + sdkOrderCloud.Me.ListSpendingAccounts(spendingAccountListOptions) + .then(function(data) { + $scope.spendingAccounts = data.Items; + if ($scope.payment.SpendingAccountID) { + $scope.payment.SpendingAccount = _.findWhere($scope.spendingAccounts, {ID: $scope.payment.SpendingAccountID}); + } else { + $scope.showPaymentOptions = true; + } + }); } $scope.changePayment = function() { @@ -49,26 +53,19 @@ function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, }; $scope.updatePayment = function(scope) { - var oldSelection = angular.copy($scope.payment.SpendingAccountID); $scope.payment.SpendingAccountID = scope.spendingAccount.ID; - //TODO: Buyer Users currently cannot patch a payment - we may need to refactor - $scope.updatingSpendingAccountPayment = sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, $scope.payment.ID, $scope.payment) - .then(function() { - $scope.showPaymentOptions = false; - toastr.success('Using ' + scope.spendingAccount.Name,'Spending Account Payment'); - $rootScope.$broadcast('OC:PaymentsUpdated'); - }) - .catch(function(ex) { - $scope.payment.SpendingAccountID = oldSelection; - $exceptionHandler(ex); - }); }; $scope.$watch('payment', function(n,o) { - if (n && !n.SpendingAccountID) { - $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', false); + if (n && !n.SpendingAccountID || n.Editing) { + $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccountNotSet', false); } else { - $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccount_Not_Set', true); + $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccountNotSet', true); } + + if (n.SpendingAccountID) n.SpendingAccount = _.findWhere($scope.spendingAccounts, {ID: $scope.payment.SpendingAccountID}); + $scope.showPaymentOptions = n.Editing; + if (n.CreditCardID) delete n.CreditCardID; + if (n.xp && n.xp.PONumber) delete n.xp.PONumber; }, true); } \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/creditCard.html b/src/app/checkout/payment/directives/templates/creditCard.html index 616337ec..af867de0 100644 --- a/src/app/checkout/payment/directives/templates/creditCard.html +++ b/src/app/checkout/payment/directives/templates/creditCard.html @@ -1,8 +1,10 @@ <!--Single Credit Card Payment View--> <div ng-form="OCPaymentCreditCard" cg-busy="updatingCreditCardPayment"> - <label>Credit Card <!--{{checkoutPayment.creditCardDisplayLimit}}--></label> - <a href="" class="pull-right" ng-click="createCreditCard(this)"><i class="fa fa-plus-circle"></i> Create Credit Card</a> - <div class="panel panel-default" ng-repeat="creditCard in creditCards" ng-if="payment.CreditCardID == creditCard.ID || (showPaymentOptions && (!excludedCreditCards || excludedCreditCards.indexOf(creditCard.ID) == -1))"> + <div ng-if="!payment.ID || payment.Editing"> + <label >Credit Card <!--{{checkoutPayment.creditCardDisplayLimit}}--></label> + <a href="" class="pull-right" ng-click="createCreditCard(this)"><i class="fa fa-plus-circle"></i> Create Credit Card</a> + </div> + <div class="panel panel-default" ng-class="{'panel-primary': creditCard.ID == payment.CreditCardID}" ng-repeat="creditCard in creditCards" ng-if="(payment.ID && payment.Editing) && payment.CreditCardID == creditCard.ID || (showPaymentOptions && (!excludedCreditCards || excludedCreditCards.indexOf(creditCard.ID) == -1))"> <div class="panel-body"> <div class="row"> <div class="col-xs-2 col-sm-1 text-center"> @@ -20,6 +22,31 @@ </div> </div> </div> + <div class="panel panel-default" ng-if="payment.CreditCardID && !payment.Editing"> + <div class="panel-body"> + <div class="row"> + <div class="col-xs-6"> + <h4>Credit Card</h4> + <div class="row"> + <div class="col-xs-2"> + <i class="fa fa-2x {{payment.CreditCard.CardType | faCreditCard}}"></i> + </div> + <div class="col-xs-6"> + <b>{{payment.CreditCard.CardholderName}}</b> <br ng-if="payment.CreditCard.CardholderName"> + <span class="text-muted">{{'XXXX-XXXX-XXXX-' + payment.CreditCard.PartialAccountNumber}}</span><br> + <small class="text-muted">Expires On: {{payment.CreditCard.ExpirationDate | date:'MM/yy'}}</small> + </div> + </div> + </div> + <div class="col-xs-4"> + <h3 class="text-success pull-right">{{payment.Amount | currency}}</h4> + </div> + <div class="col-xs-2"> + <button type="button" class="btn btn-default pull-right" ng-if="!payment.Editing" ng-click="payment.Editing = true">Edit</button> + </div> + </div> + </div> + </div> <div class="no-matches" ng-if="!creditCards.length"> You have not created any personal credit cards. </div> diff --git a/src/app/checkout/payment/directives/templates/payment.html b/src/app/checkout/payment/directives/templates/payment.html index 83e9f992..05d46ea6 100644 --- a/src/app/checkout/payment/directives/templates/payment.html +++ b/src/app/checkout/payment/directives/templates/payment.html @@ -1,16 +1,19 @@ <!--Single Payment, Multiple Types View--> -<div ng-form="{{'OCPayment' + paymentIndex}}"> - <fieldset class="form-group" ng-if="methods.length > 1"> +<div ng-form="{{'OCPayment' + paymentIndex}}" class="clearfix"> + <fieldset class="form-group" ng-if="methods.length > 1 && (!payment.ID || payment.Editing)"> <label for="payment_method">Payment Method</label> <select id="payment_method" class="form-control" ng-model="payment.Type" ng-options="method as (method | humanize) for method in methods" required></select> </fieldset> - <div ng-if="payment.Type == 'PurchaseOrder'"> + <div ng-if="payment.Type == 'PurchaseOrder'" ng-if="!payment.ID || payment.Editing"> <oc-payment-po order="order" payment="payment"></oc-payment-po> </div> - <div ng-if="payment.Type == 'SpendingAccount'"> + <div ng-if="payment.Type == 'SpendingAccount'" ng-if="!payment.ID || payment.Editing"> <oc-payment-sa order="order" payment="payment" exclude-options="excludeOptions.SpendingAccounts"></oc-payment-sa> </div> - <div ng-if="payment.Type == 'CreditCard'"> + <div ng-if="payment.Type == 'CreditCard'" ng-if="!payment.ID || payment.Editing"> <oc-payment-cc order="order" payment="payment" exclude-options="excludeOptions.CreditCards"></oc-payment-cc> </div> + <div class="pull-right"> + <button type="button" class="btn btn-success" ng-if="!payment.ID || payment.Editing" ng-click="savePayment(payment, (payment.SpendingAccount || payment.CreditCard))" ng-disabled="!paymentValid(payment)">Save Payment</button> + </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/purchaseOrder.html b/src/app/checkout/payment/directives/templates/purchaseOrder.html index ede0b44d..dbe5ccf9 100644 --- a/src/app/checkout/payment/directives/templates/purchaseOrder.html +++ b/src/app/checkout/payment/directives/templates/purchaseOrder.html @@ -1,7 +1,23 @@ <!--Single Purchase Order Payment View--> <div ng-form="OCPaymentPurchaseOrder"> - <fieldset class="form-group"> + <fieldset class="form-group" ng-if="!payment.ID || payment.Editing"> <label for="poNumber">PO Number</label> - <input id="poNumber" class="form-control" type="text" ng-model="payment.xp.PONumber" placeholder="(Optional)" ng-model-options="{debounce: 750}" ng-change="updatePayment()"/> + <input id="poNumber" class="form-control" type="text" ng-model="payment.xp.PONumber" placeholder="(Optional)"/> </fieldset> + <div class="panel panel-default" ng-if="payment.ID && !payment.Editing"> + <div class="panel-body"> + <div class="row"> + <div class="col-xs-6"> + <h4>Purchase Order</h4> + <span><b>PO Number:</b> {{payment.xp.PONumber}}</span> + </div> + <div class="col-xs-4"> + <h3 class="text-success pull-right">{{payment.Amount | currency}}</h4> + </div> + <div class="col-xs-2"> + <button type="button" class="btn btn-default pull-right" ng-if="!payment.Editing" ng-click="payment.Editing = true">Edit</button> + </div> + </div> + </div> + </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/spendingAccount.html b/src/app/checkout/payment/directives/templates/spendingAccount.html index 895b71d2..c10aad16 100644 --- a/src/app/checkout/payment/directives/templates/spendingAccount.html +++ b/src/app/checkout/payment/directives/templates/spendingAccount.html @@ -1,6 +1,6 @@ <!--Single Spending Account Payment View--> <div ng-form="OCPaymentSpendingAccount" cg-busy="updatingSpendingAccountPayment"> - <div class="panel panel-default" ng-repeat="spendingAccount in spendingAccounts" ng-if="payment.SpendingAccountID == spendingAccount.ID || (showPaymentOptions && (!excludedSpendingAccounts || excludedSpendingAccounts.indexOf(spendingAccount.ID) == -1))"> + <div class="panel panel-default" ng-class="{'panel-primary': payment.SpendingAccountID == spendingAccount.ID}" ng-repeat="spendingAccount in spendingAccounts" ng-if="(payment.ID && payment.Editing) && payment.SpendingAccountID == spendingAccount.ID || (showPaymentOptions && (!excludedSpendingAccounts || excludedSpendingAccounts.indexOf(spendingAccount.ID) == -1))"> <div class="panel-body"> <div class="row"> <div class="col-xs-6"> @@ -28,6 +28,23 @@ </div> </div> </div> + <div class="panel panel-default" ng-if="payment.SpendingAccountID && !payment.Editing"> + <div class="panel-body"> + <div class="row"> + <div class="col-xs-6"> + <h4>Spending Account</h4> + <b>{{payment.SpendingAccount.Name}}</b><br> + <span>{{payment.SpendingAccount.Balance | currency}}</span> + </div> + <div class="col-xs-4"> + <h3 class="text-success pull-right">{{payment.Amount | currency}}</h4> + </div> + <div class="col-xs-2"> + <button type="button" class="btn btn-default pull-right" ng-if="!payment.Editing" ng-click="payment.Editing = true">Edit</button> + </div> + </div> + </div> + </div> <div class="no-matches" ng-if="!spendingAccounts.length"> You do not have any spending accounts available. </div> diff --git a/src/app/checkout/payment/templates/checkout.payment.html b/src/app/checkout/payment/templates/checkout.payment.html index 5e5105ae..b84c8b8d 100644 --- a/src/app/checkout/payment/templates/checkout.payment.html +++ b/src/app/checkout/payment/templates/checkout.payment.html @@ -3,7 +3,7 @@ <div class="col-md-8"> <div> <h4>Payment</h4> - <oc-payments order="base.currentOrder"></oc-payments> + <oc-payment order="base.currentOrder"></oc-payment> </div> <hr> <a href="" class="pull-right" ng-click="checkoutPayment.createAddress(base.currentOrder)"><i class="fa fa-plus-circle"></i> Create Address</a> From c41dff2616c825891fbeeb5bfa1e0b6d36788bab Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 12:28:08 -0500 Subject: [PATCH 077/158] CheckoutPayment: Move Credit Card and Spending Account selection to modal --- .../directives/js/creditCard.controller.js | 15 ++--- .../directives/js/payment.controller.js | 11 ++-- .../directives/js/purchaseOrder.controller.js | 8 +++ .../selectPaymentAccount.modal.controller.js | 25 ++++++++ .../js/spendingAccount.controller.js | 15 ++--- .../payment/directives/payment.directives.js | 13 ----- .../directives/templates/creditCard.html | 28 +++------ .../payment/directives/templates/payment.html | 4 +- .../templates/selectPaymentAccount.modal.html | 54 +++++++++++++++++ .../directives/templates/spendingAccount.html | 38 +++--------- .../checkout/payment/js/payment.service.js | 58 ++++++++++++++++++- 11 files changed, 182 insertions(+), 87 deletions(-) create mode 100644 src/app/checkout/payment/directives/js/selectPaymentAccount.modal.controller.js delete mode 100644 src/app/checkout/payment/directives/payment.directives.js create mode 100644 src/app/checkout/payment/directives/templates/selectPaymentAccount.modal.html diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js index a42d6312..0a457a65 100644 --- a/src/app/checkout/payment/directives/js/creditCard.controller.js +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('PaymentCreditCardCtrl', PaymentCreditCardController) ; -function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocMyCreditCards) { +function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocMyCreditCards, ocCheckoutPaymentService) { var creditCardListOptions = { page: 1, pageSize: 100 @@ -56,8 +56,13 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand }); } - $scope.changePayment = function() { - $scope.showPaymentOptions = true; + $scope.changePaymentAccount = function() { + ocCheckoutPaymentService.SelectPaymentAccount($scope.payment, $scope.order) + .then(function(payment) { + $scope.payment = payment; + $scope.OCPaymentCreditCard.$setValidity('CreditCardNotSet', true); + $rootScope.$broadcast('OCPaymentUpdated', payment); + }); }; $scope.$watch('payment', function(n,o) { @@ -74,10 +79,6 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand if (n.xp && n.xp.PONumber) delete n.xp.PONumber; }, true); - $scope.updatePayment = function(scope) { - $scope.payment.CreditCardID = scope.creditCard.ID; - }; - $scope.createCreditCard = function() { ocMyCreditCards.Create() .then(function(card) { diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js index 869f3d23..50860a08 100644 --- a/src/app/checkout/payment/directives/js/payment.controller.js +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -44,7 +44,11 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS $scope.payment.Type = $scope.methods[0]; } - $scope.savePayment = function(payment, object) { + $rootScope.$on('OCPaymentUpdated', function(event, payment) { + $scope.payment = payment; + }); + + $scope.savePayment = function(payment) { if (payment.ID) { sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, payment.ID) .then(function() { @@ -60,15 +64,14 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS .then(function(data) { data.Editing = false; $scope.OCPayment.$setValidity('ValidPayment', true); - if (data.SpendingAccountID) data.SpendingAccount = object; - if (data.CreditCardID) data.CreditCard = object; $scope.payment = data; }); } }; + $scope.paymentValid = function(payment) { - if (!payment || payment.Amount != $scope.order.Total) return false; //TODO: refactor for multiple payments + if (!payment || payment.Editing || payment.Amount != $scope.order.Total) return false; //TODO: refactor for multiple payments var valid = false; diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js index bf09cf0d..57f5b010 100644 --- a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -30,4 +30,12 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t $scope.payment.CreditCardID = null; $scope.payment.SpendingAccountID = null; } + + $scope.$watch('payment', function(n,o) { + if (n.Editing) { + $scope.OCPaymentPurchaseOrder.$setValidity('PurchaseOrderNotSaved', false); + } else { + $scope.OCPaymentPurchaseOrder.$setValidity('PurchaseOrderNotSaved', true); + } + }, true); } \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/selectPaymentAccount.modal.controller.js b/src/app/checkout/payment/directives/js/selectPaymentAccount.modal.controller.js new file mode 100644 index 00000000..f1265c23 --- /dev/null +++ b/src/app/checkout/payment/directives/js/selectPaymentAccount.modal.controller.js @@ -0,0 +1,25 @@ +angular.module('orderCloud') + .controller('SelectPaymentAccountModalCtrl', SelectPaymentAccountModalController) +; + +function SelectPaymentAccountModalController($uibModalInstance, ocCheckoutPaymentService, Accounts, Payment, Order) { + var vm = this; + vm.accounts = Accounts; + vm.payment = angular.copy(Payment); + + vm.submit = function(account) { + if ((vm.payment.Type == 'SpendingAccount' && (Payment.SpendingAccountID == account.ID)) || (vm.payment.Type == 'CreditCard' && (Payment.CreditCardID == account.ID))) { + $uibModalInstance.dismiss(); + } else { + vm.payment[vm.payment.Type == 'SpendingAccount' ? 'SpendingAccountID' : 'CreditCardID'] = account.ID; + ocCheckoutPaymentService.Save(vm.payment, Order, account) + .then(function(payment) { + $uibModalInstance.close(payment); + }); + } + }; + + vm.cancel = function() { + $uibModalInstance.dismiss(); + } +} \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/spendingAccount.controller.js b/src/app/checkout/payment/directives/js/spendingAccount.controller.js index 12388ffe..893620d7 100644 --- a/src/app/checkout/payment/directives/js/spendingAccount.controller.js +++ b/src/app/checkout/payment/directives/js/spendingAccount.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('PaymentSpendingAccountCtrl', PaymentSpendingAccountController) ; -function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud) { +function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService) { if (!$scope.payment) { sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) .then(function(data) { @@ -48,12 +48,13 @@ function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, }); } - $scope.changePayment = function() { - $scope.showPaymentOptions = true; - }; - - $scope.updatePayment = function(scope) { - $scope.payment.SpendingAccountID = scope.spendingAccount.ID; + $scope.changePaymentAccount = function() { + ocCheckoutPaymentService.SelectPaymentAccount($scope.payment, $scope.order) + .then(function(payment) { + $scope.payment = payment; + $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccountNotSet', true); + $rootScope.$broadcast('OCPaymentUpdated', payment); + }); }; $scope.$watch('payment', function(n,o) { diff --git a/src/app/checkout/payment/directives/payment.directives.js b/src/app/checkout/payment/directives/payment.directives.js deleted file mode 100644 index 384ee9a8..00000000 --- a/src/app/checkout/payment/directives/payment.directives.js +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/app/checkout/payment/directives/templates/creditCard.html b/src/app/checkout/payment/directives/templates/creditCard.html index af867de0..e9058f70 100644 --- a/src/app/checkout/payment/directives/templates/creditCard.html +++ b/src/app/checkout/payment/directives/templates/creditCard.html @@ -4,25 +4,10 @@ <label >Credit Card <!--{{checkoutPayment.creditCardDisplayLimit}}--></label> <a href="" class="pull-right" ng-click="createCreditCard(this)"><i class="fa fa-plus-circle"></i> Create Credit Card</a> </div> - <div class="panel panel-default" ng-class="{'panel-primary': creditCard.ID == payment.CreditCardID}" ng-repeat="creditCard in creditCards" ng-if="(payment.ID && payment.Editing) && payment.CreditCardID == creditCard.ID || (showPaymentOptions && (!excludedCreditCards || excludedCreditCards.indexOf(creditCard.ID) == -1))"> - <div class="panel-body"> - <div class="row"> - <div class="col-xs-2 col-sm-1 text-center"> - <i class="fa fa-2x {{creditCard.CardType | faCreditCard}}"></i> - </div> - <div class="col-xs-6 col-sm-8"> - <b>{{creditCard.CardholderName}}</b> <br ng-if="creditCard.CardholderName"> - <span class="text-muted">{{'XXXX-XXXX-XXXX-' + creditCard.PartialAccountNumber}}</span><br> - <small class="text-muted">Expires On: {{creditCard.ExpirationDate | date:'MM/yy'}}</small> - </div> - <div class="col-xs-4 col-sm-3 text-right"> - <a href="" ng-click="changePayment()" ng-if="!showPaymentOptions">Change</a> - <a href="" ng-click="updatePayment(this)" ng-if="showPaymentOptions">Select</a> - </div> - </div> - </div> + <div class="no-matches" ng-if="!payment.CreditCardID && creditCards.length"> + You have not selected a credit card. <a ng-click="changePaymentAccount()">Select one now.</a> </div> - <div class="panel panel-default" ng-if="payment.CreditCardID && !payment.Editing"> + <div class="panel panel-default" ng-if="payment.CreditCardID"> <div class="panel-body"> <div class="row"> <div class="col-xs-6"> @@ -38,11 +23,12 @@ <h4>Credit Card</h4> </div> </div> </div> - <div class="col-xs-4"> + <div class="col-xs-3"> <h3 class="text-success pull-right">{{payment.Amount | currency}}</h4> </div> - <div class="col-xs-2"> - <button type="button" class="btn btn-default pull-right" ng-if="!payment.Editing" ng-click="payment.Editing = true">Edit</button> + <div class="col-xs-3"> + <button style="margin-bottom: 10px;" type="button" class="btn btn-default pull-right" ng-click="changePaymentAccount()">Change Account</button> + <button type="button" class="btn btn-default pull-right" ng-click="payment.Editing = true">Edit Payment</button> </div> </div> </div> diff --git a/src/app/checkout/payment/directives/templates/payment.html b/src/app/checkout/payment/directives/templates/payment.html index 05d46ea6..733e8336 100644 --- a/src/app/checkout/payment/directives/templates/payment.html +++ b/src/app/checkout/payment/directives/templates/payment.html @@ -13,7 +13,7 @@ <div ng-if="payment.Type == 'CreditCard'" ng-if="!payment.ID || payment.Editing"> <oc-payment-cc order="order" payment="payment" exclude-options="excludeOptions.CreditCards"></oc-payment-cc> </div> - <div class="pull-right"> - <button type="button" class="btn btn-success" ng-if="!payment.ID || payment.Editing" ng-click="savePayment(payment, (payment.SpendingAccount || payment.CreditCard))" ng-disabled="!paymentValid(payment)">Save Payment</button> + <div ng-if="payment.Type == 'PurchaseOrder' && payment.Editing"> + <button type="button" class="btn btn-success" ng-click="savePayment(payment)">Save</button> </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/selectPaymentAccount.modal.html b/src/app/checkout/payment/directives/templates/selectPaymentAccount.modal.html new file mode 100644 index 00000000..cb1d00e0 --- /dev/null +++ b/src/app/checkout/payment/directives/templates/selectPaymentAccount.modal.html @@ -0,0 +1,54 @@ +<form name="selectPaymentAccountModalForm"> + <div class="modal-header"> + <button type="button" class="close" aria-label="Close" ng-click="selectPaymentAccount.cancel()"><span aria-hidden="true">×</span></button> + <h3 class="modal-title">New Address</h3> + </div> + <div class="modal-body" ng-if="selectPaymentAccount.payment.Type == 'SpendingAccount'"> + <div class="panel panel-default" ng-class="{'panel-primary': selectPaymentAccount.payment.SpendingAccountID == spendingAccount.ID}" ng-repeat="spendingAccount in selectPaymentAccount.accounts.Items""> + <div class="panel-body"> + <div class="row"> + <div class="col-xs-6"> + <b>{{spendingAccount.Name}}</b> + <div class="text-muted"> + <small ng-if="spendingAccount.StartDate && spendingAccount.EndDate"> + Lifetime: {{spendingAccount.StartDate | date:'shortDate'}} - {{spendingAccount.EndDate | date :'shortDate'}} + </small> + <small ng-if="spendingAccount.StartDate && !spendingAccount.EndDate"> + Made Available On: {{spendingAccount.StartDate | date:'shortDate'}} + </small> + <small ng-if="!spendingAccount.StartDate && spendingAccount.EndDate"> + Expires On: {{spendingAccount.EndDate | date :'shortDate'}} + </small> + </div> + </div> + <div class="col-xs-4 text-right"> + <!--TODO: remove the inline style here--> + <p style="margin:0;" class="lead text-primary" ng-if="spendingAccount.Balance">{{spendingAccount.Balance | currency}}</p> + </div> + <div class="col-xs-2 text-right"> + <a ng-click="selectPaymentAccount.submit(spendingAccount)">Select</a> + </div> + </div> + </div> + </div> + </div> + <div class="modal-body" ng-if="selectPaymentAccount.payment.Type == 'CreditCard'"> + <div class="panel panel-default" ng-class="{'panel-primary': creditCard.ID == selectPaymentAccount.payment.CreditCardID}" ng-repeat="creditCard in selectPaymentAccount.accounts.Items"> + <div class="panel-body"> + <div class="row"> + <div class="col-xs-2 col-sm-1 text-center"> + <i class="fa fa-2x {{creditCard.CardType | faCreditCard}}"></i> + </div> + <div class="col-xs-6 col-sm-8"> + <b>{{creditCard.CardholderName}}</b> <br ng-if="creditCard.CardholderName"> + <span class="text-muted">{{'XXXX-XXXX-XXXX-' + creditCard.PartialAccountNumber}}</span><br> + <small class="text-muted">Expires On: {{creditCard.ExpirationDate | date:'MM/yy'}}</small> + </div> + <div class="col-xs-4 col-sm-3 text-right"> + <a ng-click="selectPaymentAccount.submit(creditCard)"">Select</a> + </div> + </div> + </div> + </div> + </div> +</form> \ No newline at end of file diff --git a/src/app/checkout/payment/directives/templates/spendingAccount.html b/src/app/checkout/payment/directives/templates/spendingAccount.html index c10aad16..b70d0570 100644 --- a/src/app/checkout/payment/directives/templates/spendingAccount.html +++ b/src/app/checkout/payment/directives/templates/spendingAccount.html @@ -1,34 +1,9 @@ <!--Single Spending Account Payment View--> <div ng-form="OCPaymentSpendingAccount" cg-busy="updatingSpendingAccountPayment"> - <div class="panel panel-default" ng-class="{'panel-primary': payment.SpendingAccountID == spendingAccount.ID}" ng-repeat="spendingAccount in spendingAccounts" ng-if="(payment.ID && payment.Editing) && payment.SpendingAccountID == spendingAccount.ID || (showPaymentOptions && (!excludedSpendingAccounts || excludedSpendingAccounts.indexOf(spendingAccount.ID) == -1))"> - <div class="panel-body"> - <div class="row"> - <div class="col-xs-6"> - <b>{{spendingAccount.Name}}</b> - <div class="text-muted"> - <small ng-if="spendingAccount.StartDate && spendingAccount.EndDate"> - Lifetime: {{spendingAccount.StartDate | date:'shortDate'}} - {{spendingAccount.EndDate | date :'shortDate'}} - </small> - <small ng-if="spendingAccount.StartDate && !spendingAccount.EndDate"> - Made Available On: {{spendingAccount.StartDate | date:'shortDate'}} - </small> - <small ng-if="!spendingAccount.StartDate && spendingAccount.EndDate"> - Expires On: {{spendingAccount.EndDate | date :'shortDate'}} - </small> - </div> - </div> - <div class="col-xs-4 text-right"> - <!--TODO: remove the inline style here--> - <p style="margin:0;" class="lead text-primary" ng-if="spendingAccount.Balance">{{spendingAccount.Balance | currency}}</p> - </div> - <div class="col-xs-2 text-right"> - <a href="" ng-click="changePayment()" ng-if="!showPaymentOptions">Change</a> - <a href="" ng-click="updatePayment(this)" ng-if="showPaymentOptions">Select</a> - </div> - </div> - </div> + <div class="no-matches" ng-if="!payment.SpendingAccountID && spendingAccounts.length"> + You have not selected a spending account. <a ng-click="changePaymentAccount()">Select one now.</a> </div> - <div class="panel panel-default" ng-if="payment.SpendingAccountID && !payment.Editing"> + <div class="panel panel-default" ng-if="payment.SpendingAccountID"> <div class="panel-body"> <div class="row"> <div class="col-xs-6"> @@ -36,11 +11,12 @@ <h4>Spending Account</h4> <b>{{payment.SpendingAccount.Name}}</b><br> <span>{{payment.SpendingAccount.Balance | currency}}</span> </div> - <div class="col-xs-4"> + <div class="col-xs-3"> <h3 class="text-success pull-right">{{payment.Amount | currency}}</h4> </div> - <div class="col-xs-2"> - <button type="button" class="btn btn-default pull-right" ng-if="!payment.Editing" ng-click="payment.Editing = true">Edit</button> + <div class="col-xs-3"> + <button style="margin-bottom: 10px;" type="button" class="btn btn-default pull-right" ng-click="changePaymentAccount()">Change Account</button> + <button type="button" class="btn btn-default pull-right" ng-click="payment.Editing = true">Edit Payment</button> </div> </div> </div> diff --git a/src/app/checkout/payment/js/payment.service.js b/src/app/checkout/payment/js/payment.service.js index 058568a7..6c59c9fb 100644 --- a/src/app/checkout/payment/js/payment.service.js +++ b/src/app/checkout/payment/js/payment.service.js @@ -2,10 +2,12 @@ angular.module('orderCloud') .factory('ocCheckoutPaymentService', OrderCloudCheckoutPaymentService) ; -function OrderCloudCheckoutPaymentService($q, sdkOrderCloud) { +function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { var service = { PaymentsExceedTotal: _paymentsExceedTotal, - RemoveAllPayments: _removeAllPayments + RemoveAllPayments: _removeAllPayments, + SelectPaymentAccount: _selectPaymentAccount, + Save: _save }; function _paymentsExceedTotal(payments, orderTotal) { @@ -32,5 +34,57 @@ function OrderCloudCheckoutPaymentService($q, sdkOrderCloud) { return deferred.promise; } + function _selectPaymentAccount(payment, order) { + return $uibModal.open({ + templateUrl: 'checkout/payment/directives/templates/selectPaymentAccount.modal.html', + controller: 'SelectPaymentAccountModalCtrl', + controllerAs: 'selectPaymentAccount', + size: 'md', + resolve: { + Accounts: function(sdkOrderCloud) { + var options = {page: 1, pageSize: 100}; + if (payment.Type == 'SpendingAccount') { + options.filters = {RedemptionCode: '!*', AllowAsPaymentMethod: true}; + return sdkOrderCloud.Me.ListSpendingAccounts(options); + } else { + return sdkOrderCloud.Me.ListCreditCards(options); + } + }, + Payment: function() { + return payment; + }, + Order: function() { + return order; + } + } + }).result; + } + + function _save(payment, order, account) { + var df = $q.defer(); + + if (payment.ID) { + sdkOrderCloud.Payments.Delete('outgoing', order.ID, payment.ID) + .then(function() { + delete payment.ID; + createPayment(payment); + }); + } else { + createPayment(payment); + } + + function createPayment(newPayment) { + sdkOrderCloud.Payments.Create('outgoing', order.ID, newPayment) + .then(function(data) { + if (data.SpendingAccountID) data.SpendingAccount = account; + if (data.CreditCardID) data.CreditCard = account; + + df.resolve(data); + }); + } + + return df.promise; + } + return service; } \ No newline at end of file From 78f845be80ae67f6acd863e114b5b370c7aaed31 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 13:26:40 -0500 Subject: [PATCH 078/158] Checkout Payments: allow API to set payment.Accepted --- .../checkout/payment/directives/js/creditCard.controller.js | 1 - src/app/checkout/payment/directives/js/payment.controller.js | 3 +-- src/app/checkout/payment/directives/js/payments.controller.js | 1 - .../checkout/payment/directives/js/purchaseOrder.controller.js | 1 - .../payment/directives/js/spendingAccount.controller.js | 1 - src/app/checkout/payment/directives/templates/payment.html | 2 +- src/app/checkout/payment/js/payment.service.js | 1 + 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js index 0a457a65..50023c46 100644 --- a/src/app/checkout/payment/directives/js/creditCard.controller.js +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -27,7 +27,6 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - Accepted: false, xp: {} }; $scope.payment = payment; diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js index 50860a08..679f85a5 100644 --- a/src/app/checkout/payment/directives/js/payment.controller.js +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -17,7 +17,6 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - Accepted: false, xp: {} }; $scope.payment = payment; @@ -34,7 +33,6 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - Accepted: false, xp: {} }; $scope.payment = payment; @@ -60,6 +58,7 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS } function createPayment(newPayment) { + if (angular.isDefined(newPayment.Accepted)) delete newPayment.Accepted; sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, newPayment) .then(function(data) { data.Editing = false; diff --git a/src/app/checkout/payment/directives/js/payments.controller.js b/src/app/checkout/payment/directives/js/payments.controller.js index e56d0fd6..70809998 100644 --- a/src/app/checkout/payment/directives/js/payments.controller.js +++ b/src/app/checkout/payment/directives/js/payments.controller.js @@ -35,7 +35,6 @@ function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOr SpendingAccountID: null, Description: null, Amount: paymentTotal, - Accepted: false, xp: {} }; $scope.payments.Items.push(payment); diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js index 57f5b010..f1c39f0a 100644 --- a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -16,7 +16,6 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - Accepted: false, xp: {} }; $scope.payment = payment; diff --git a/src/app/checkout/payment/directives/js/spendingAccount.controller.js b/src/app/checkout/payment/directives/js/spendingAccount.controller.js index 893620d7..66be0fd2 100644 --- a/src/app/checkout/payment/directives/js/spendingAccount.controller.js +++ b/src/app/checkout/payment/directives/js/spendingAccount.controller.js @@ -18,7 +18,6 @@ function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - Accepted: false, xp: {} }; $scope.payment = payment; diff --git a/src/app/checkout/payment/directives/templates/payment.html b/src/app/checkout/payment/directives/templates/payment.html index 733e8336..80315482 100644 --- a/src/app/checkout/payment/directives/templates/payment.html +++ b/src/app/checkout/payment/directives/templates/payment.html @@ -13,7 +13,7 @@ <div ng-if="payment.Type == 'CreditCard'" ng-if="!payment.ID || payment.Editing"> <oc-payment-cc order="order" payment="payment" exclude-options="excludeOptions.CreditCards"></oc-payment-cc> </div> - <div ng-if="payment.Type == 'PurchaseOrder' && payment.Editing"> + <div ng-if="payment.Type == 'PurchaseOrder' && (payment.Editing || !payment.ID)"> <button type="button" class="btn btn-success" ng-click="savePayment(payment)">Save</button> </div> </div> \ No newline at end of file diff --git a/src/app/checkout/payment/js/payment.service.js b/src/app/checkout/payment/js/payment.service.js index 6c59c9fb..71f820cd 100644 --- a/src/app/checkout/payment/js/payment.service.js +++ b/src/app/checkout/payment/js/payment.service.js @@ -74,6 +74,7 @@ function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { } function createPayment(newPayment) { + if (angular.isDefined(newPayment.Accepted)) delete newPayment.Accepted; sdkOrderCloud.Payments.Create('outgoing', order.ID, newPayment) .then(function(data) { if (data.SpendingAccountID) data.SpendingAccount = account; From 72239db09ef4dc44d02ac1053bf2c00abe3255c6 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 14:49:03 -0500 Subject: [PATCH 079/158] Me.ListProducts depth: 'all' --- src/app/categoryBrowse/js/categoryBrowse.config.js | 2 +- src/app/productBrowse/js/productBrowse.config.js | 2 +- src/app/productSearch/js/productSearch.component.js | 3 ++- src/app/productSearch/js/productSearch.config.js | 2 +- src/app/productSearch/js/productSearch.modal.controller.js | 3 ++- src/app/repeatOrder/js/repeatOrder.service.js | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/categoryBrowse/js/categoryBrowse.config.js b/src/app/categoryBrowse/js/categoryBrowse.config.js index 60a1659d..7fec6453 100644 --- a/src/app/categoryBrowse/js/categoryBrowse.config.js +++ b/src/app/categoryBrowse/js/categoryBrowse.config.js @@ -22,7 +22,7 @@ function CategoryBrowseConfig($stateProvider, catalogid){ ProductList: function(sdkOrderCloud, Parameters, catalogid) { if(Parameters && Parameters.filters && Parameters.filters.ParentID) { delete Parameters.filters.ParentID; - var parameters = angular.extend(Parameters, {catalogID: catalogid, page: (Parameters.productPage || Parameters.page), pageSize: (Parameters.pageSize || 12)}); + var parameters = angular.extend(Parameters, {depth: 'all', catalogID: catalogid, page: (Parameters.productPage || Parameters.page), pageSize: (Parameters.pageSize || 12)}); return sdkOrderCloud.Me.ListProducts(parameters); } else { return null; diff --git a/src/app/productBrowse/js/productBrowse.config.js b/src/app/productBrowse/js/productBrowse.config.js index 7876e1ff..e2da768c 100644 --- a/src/app/productBrowse/js/productBrowse.config.js +++ b/src/app/productBrowse/js/productBrowse.config.js @@ -64,7 +64,7 @@ function ProductBrowseConfig($urlRouterProvider, $stateProvider) { } else if (Parameters.filters) { delete Parameters.filters.ID; } - var parameters = angular.extend(Parameters, {catalogID: catalogid, filters: {categoryid: Parameters.categoryid}}); + var parameters = angular.extend(Parameters, {catalogID: catalogid, categoryid: Parameters.categoryid, depth: 'all'}); return sdkOrderCloud.Me.ListProducts(parameters); } } diff --git a/src/app/productSearch/js/productSearch.component.js b/src/app/productSearch/js/productSearch.component.js index 3e674f66..247d6e50 100644 --- a/src/app/productSearch/js/productSearch.component.js +++ b/src/app/productSearch/js/productSearch.component.js @@ -22,7 +22,8 @@ function ProductSearchComponentController($state, sdkOrderCloud, catalogid) { catalogID: catalogid, search: vm.searchTerm, page: 1, - pageSize: vm.maxProducts || 5 + pageSize: vm.maxProducts || 5, + depth: 'all' }; return sdkOrderCloud.Me.ListProducts(parameters) .then(function(data) { diff --git a/src/app/productSearch/js/productSearch.config.js b/src/app/productSearch/js/productSearch.config.js index 88c772a6..df73ab61 100644 --- a/src/app/productSearch/js/productSearch.config.js +++ b/src/app/productSearch/js/productSearch.config.js @@ -15,7 +15,7 @@ function ProductSearchConfig($stateProvider) { return ocParameters.Get($stateParams); }, ProductList: function(sdkOrderCloud, Parameters, catalogid) { - var parameters = angular.extend(Parameters, {catalogID: catalogid, pageSize: (Parameters.pageSize || 12)}); + var parameters = angular.extend(Parameters, {catalogID: catalogid, depth: 'all', pageSize: (Parameters.pageSize || 12)}); return sdkOrderCloud.Me.ListProducts(parameters); } } diff --git a/src/app/productSearch/js/productSearch.modal.controller.js b/src/app/productSearch/js/productSearch.modal.controller.js index 0f417b2e..396e5aa7 100644 --- a/src/app/productSearch/js/productSearch.modal.controller.js +++ b/src/app/productSearch/js/productSearch.modal.controller.js @@ -14,7 +14,8 @@ function ProductSearchModalController($uibModalInstance, $timeout, $scope, sdkOr catalogID: catalogid, search: vm.searchTerm, page: 1, - pageSize: vm.maxProducts || 5 + pageSize: vm.maxProducts || 5, + depth: 'all' }; return sdkOrderCloud.Me.ListProducts(parameters) .then(function(data) { diff --git a/src/app/repeatOrder/js/repeatOrder.service.js b/src/app/repeatOrder/js/repeatOrder.service.js index 60aa9809..13a81fe9 100644 --- a/src/app/repeatOrder/js/repeatOrder.service.js +++ b/src/app/repeatOrder/js/repeatOrder.service.js @@ -32,7 +32,8 @@ function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, var options = { catalogID: catalogid, page: 1, - pageSize: 100 + pageSize: 100, + depth: 'all' }; sdkOrderCloud.Me.ListProducts(options) .then(function(data) { From 6c61136fa0648a95890312584a758914beb87662 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Thu, 6 Apr 2017 14:51:33 -0500 Subject: [PATCH 080/158] Me.ListProducts depth: 'all' update --- src/app/productBrowse/js/productBrowse.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/productBrowse/js/productBrowse.config.js b/src/app/productBrowse/js/productBrowse.config.js index e2da768c..5f493ffe 100644 --- a/src/app/productBrowse/js/productBrowse.config.js +++ b/src/app/productBrowse/js/productBrowse.config.js @@ -64,7 +64,7 @@ function ProductBrowseConfig($urlRouterProvider, $stateProvider) { } else if (Parameters.filters) { delete Parameters.filters.ID; } - var parameters = angular.extend(Parameters, {catalogID: catalogid, categoryid: Parameters.categoryid, depth: 'all'}); + var parameters = angular.extend(Parameters, {catalogID: catalogid, categoryID: Parameters.categoryid, depth: 'all'}); return sdkOrderCloud.Me.ListProducts(parameters); } } From f27d274a8d4a2ae50e52c3e6eb3aa12522623141 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Fri, 7 Apr 2017 10:19:34 -0500 Subject: [PATCH 081/158] Add some context to a comment OC-2054 --- src/app/styles/shame.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/styles/shame.less b/src/app/styles/shame.less index ca3af97d..ce4cb867 100644 --- a/src/app/styles/shame.less +++ b/src/app/styles/shame.less @@ -43,7 +43,7 @@ li a, text-align:center; } -// Overriding default bootstrap behavior +// Overriding default bootstrap behavior - we aren't using the default nav collapse UX .navbar-header, .navbar-nav > li { float: left; From 2fc724a7171b19b916aea5142a6e2ec499b9a2d4 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 7 Apr 2017 13:12:27 -0500 Subject: [PATCH 082/158] OC-2105 Payment validation fix --- src/app/checkout/payment/directives/js/payment.controller.js | 3 ++- .../checkout/payment/directives/js/purchaseOrder.controller.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js index 679f85a5..61b58ffa 100644 --- a/src/app/checkout/payment/directives/js/payment.controller.js +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -33,7 +33,8 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - xp: {} + xp: {}, + Editing: true }; $scope.payment = payment; } diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js index f1c39f0a..076376fb 100644 --- a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -16,7 +16,8 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t SpendingAccountID: null, Description: null, Amount: $scope.order.Total, - xp: {} + xp: {}, + Editing: true }; $scope.payment = payment; } From 4998562abd71b3c31da3eb047133e72a802cf85f Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 13:16:26 -0500 Subject: [PATCH 083/158] update app.contsants.json to be an array of roles --- src/app/app.constants.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/app.constants.json b/src/app/app.constants.json index 5d2e3f82..db066655 100644 --- a/src/app/app.constants.json +++ b/src/app/app.constants.json @@ -1,6 +1,6 @@ { "appname": "Angular Buyer", - "scope": ["BuyerReader MeAdmin MeXpAdmin MeAddressAdmin MeCreditCardAdmin Shopper PasswordReset"], + "scope": ["BuyerReader", "MeAdmin", "MeXpAdmin", "MeAddressAdmin", "MeCreditCardAdmin", "Shopper", "PasswordReset"], "clientid": "AEFFD7B0-C7A4-4E68-AB31-15B454964A7B", "buyerid": "EXO-1E", "anonymous": false, From a0974d1f8b317bf75f2aaf7641e8682fcd4252f8 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 13:25:09 -0500 Subject: [PATCH 084/158] OC-2043 - Hide product browse category panel when no categories exist --- src/app/productBrowse/templates/productBrowse.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/productBrowse/templates/productBrowse.html b/src/app/productBrowse/templates/productBrowse.html index 2e5c5ecf..eabcea5a 100644 --- a/src/app/productBrowse/templates/productBrowse.html +++ b/src/app/productBrowse/templates/productBrowse.html @@ -20,10 +20,11 @@ <!--START CATEGORY TREE--> <aside class="col-md-3 visible-md visible-lg"> <div class="panel panel-default" hl-sticky anchor="top" offset-top="70" stick-limit="true" media-query="min-width: 992px"> - <div class="panel-heading"> + <div class="panel-heading" ng-if="productBrowse.treeConfig.treeData.length"> <b class="panel-title">Categories</b> </div> <treecontrol class="oc-tree" + ng-if="productBrowse.treeConfig.treeData.length" tree-model="productBrowse.treeConfig.treeData" options="productBrowse.treeConfig.treeOptions" selected-node="productBrowse.treeConfig.selectedNode" From 286f809999e9b10db9de13a9ba4792a8e29bd49b Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 13:30:14 -0500 Subject: [PATCH 085/158] OC-2052 adding .no-matches wherever well* text-center is used --- src/app/cart/templates/cart.html | 2 +- src/app/categoryBrowse/templates/categoryBrowse.html | 4 ++-- src/app/checkout/payment/templates/checkout.payment.html | 2 +- src/app/checkout/shipping/templates/checkout.shipping.html | 2 +- src/app/checkout/templates/addressSelect.modal.html | 2 +- src/app/productSearch/templates/productSearch.results.html | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/cart/templates/cart.html b/src/app/cart/templates/cart.html index e38a3e79..6e8d047e 100644 --- a/src/app/cart/templates/cart.html +++ b/src/app/cart/templates/cart.html @@ -8,7 +8,7 @@ <h3> Shopping Cart </h3> <hr> - <div class="well text-center" ng-if="!cart.lineItems.Items.length">You do not have any items in your cart.</div> + <div class="no-matches" ng-if="!cart.lineItems.Items.length">You do not have any items in your cart.</div> <div class="row" ng-if="cart.lineItems.Items.length"> <aside class="col-md-4 col-md-push-8"> <div class="panel panel-default" hl-sticky anchor="top" offset-top="70" media-query="min-width: 992px" cg-busy="base.orderLoading"> diff --git a/src/app/categoryBrowse/templates/categoryBrowse.html b/src/app/categoryBrowse/templates/categoryBrowse.html index f041f61f..56b2cd85 100644 --- a/src/app/categoryBrowse/templates/categoryBrowse.html +++ b/src/app/categoryBrowse/templates/categoryBrowse.html @@ -62,8 +62,8 @@ <h3 class="page-header">{{categoryBrowse.productList.Items.length > 1 ? 'Product <div class="page-header"> <h3>No Results</h3> </div> - <div class="well well-lg text-center"> - <b> No products or categories</b> + <div class="no-matches"> + No products or categories </div> </div> </article> \ No newline at end of file diff --git a/src/app/checkout/payment/templates/checkout.payment.html b/src/app/checkout/payment/templates/checkout.payment.html index b84c8b8d..332f90c3 100644 --- a/src/app/checkout/payment/templates/checkout.payment.html +++ b/src/app/checkout/payment/templates/checkout.payment.html @@ -8,7 +8,7 @@ <h4>Payment</h4> <hr> <a href="" class="pull-right" ng-click="checkoutPayment.createAddress(base.currentOrder)"><i class="fa fa-plus-circle"></i> Create Address</a> <h4>Billing Address</h4> - <div class="well text-center" ng-if="!checkout.billingAddress"> + <div class="no-matches" ng-if="!checkout.billingAddress"> You currently do not have a billing address selected. <br /> <a href="" ng-click="checkoutPayment.changeBillingAddress(base.currentOrder)">Select one now</a> </div> diff --git a/src/app/checkout/shipping/templates/checkout.shipping.html b/src/app/checkout/shipping/templates/checkout.shipping.html index d7133aad..1cd4a1eb 100644 --- a/src/app/checkout/shipping/templates/checkout.shipping.html +++ b/src/app/checkout/shipping/templates/checkout.shipping.html @@ -12,7 +12,7 @@ <h4>Delivery Address</h4> <p ng-bind-html="checkout.shippingAddress | address:'full'"></p> </div> </div> - <div class="well text-center" ng-if="!checkout.shippingAddress"> + <div class="no-matches" ng-if="!checkout.shippingAddress"> You currently do not have a shipping address selected. <br /> <a href="" ng-click="checkoutShipping.changeShippingAddress(base.currentOrder)">Select one now</a> </div> diff --git a/src/app/checkout/templates/addressSelect.modal.html b/src/app/checkout/templates/addressSelect.modal.html index 095f5fa2..d8c4620a 100644 --- a/src/app/checkout/templates/addressSelect.modal.html +++ b/src/app/checkout/templates/addressSelect.modal.html @@ -3,7 +3,7 @@ <h3 class="modal-title">Select Address</h3> </div> <div class="modal-body"> - <div class="well text-center" ng-if="!addressSelect.addresses.Items.length"> + <div class="no-matches" ng-if="!addressSelect.addresses.Items.length"> You currently do not have any addresses available. <br /> <a href="" ng-click="addressSelect.createAddress()">Create one now</a> </div> diff --git a/src/app/productSearch/templates/productSearch.results.html b/src/app/productSearch/templates/productSearch.results.html index 6ab2787e..44a7ff5a 100644 --- a/src/app/productSearch/templates/productSearch.results.html +++ b/src/app/productSearch/templates/productSearch.results.html @@ -45,8 +45,8 @@ <h5 class="pull-left"><b>{{(application.$ocMedia('min-width:768px') ? productSea </div> </div> <!-- No Results Found --> - <div ng-if="!productSearch.list.Items.length" class="well well-lg text-center"> - <b><i class="fa fa-search"></i> No products or categories match your search.</b> + <div ng-if="!productSearch.list.Items.length" class="no-matches"> + <i class="fa fa-search"></i> No products or categories match your search. </div> <!-- Pagination --> <uib-pagination From 0413820dd3ab6c4affa0c805d0a7aca3d2df7948 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 13:56:45 -0500 Subject: [PATCH 086/158] OC-2053 Update all toastr messages to use the same formatting - Also removed toastr errors on misconfigured components/directives. These are now using the angular $log service to log an error to the console. --- .../addPromotion/js/addPromotion.controller.js | 2 +- src/app/cart/js/cart.config.js | 4 ++-- src/app/cart/js/cart.controller.js | 4 ++-- src/app/checkout/js/checkout.controller.js | 11 ++++++----- .../directives/js/creditCard.controller.js | 6 +++--- .../directives/js/payments.controller.js | 6 +++--- .../checkout/payment/js/payment.controller.js | 2 +- src/app/checkout/review/js/review.config.js | 2 +- .../checkout/shipping/js/shipping.controller.js | 4 ++-- .../oc-quantity-input/oc-quantity-input.js | 17 ++++++++--------- .../js/favoriteOrders.component.js | 4 ++-- .../js/favoriteProduct.controller.js | 4 ++-- src/app/login/js/login.service.js | 2 +- .../myAddresses/js/myAddresses.controller.js | 8 ++++---- .../approvals/js/approvals.controller.js | 2 +- src/app/myPayments/js/myPayments.controller.js | 6 +++--- .../js/productDetail.controller.js | 2 +- .../js/productQuickView.controller.js | 2 +- .../repeatOrder/js/repeatOrder.controller.js | 4 ++-- src/app/repeatOrder/js/repeatOrder.service.js | 2 +- 20 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/app/addPromotion/js/addPromotion.controller.js b/src/app/addPromotion/js/addPromotion.controller.js index d530dbd7..18f5e3fd 100644 --- a/src/app/addPromotion/js/addPromotion.controller.js +++ b/src/app/addPromotion/js/addPromotion.controller.js @@ -8,7 +8,7 @@ function AddPromotionComponentController($exceptionHandler, $rootScope, sdkOrder .then(function(promo) { $rootScope.$broadcast('OC:UpdatePromotions', orderID); $rootScope.$broadcast('OC:UpdateOrder', orderID); - toastr.success('Promo code '+ promo.Code + ' added!', 'Success'); + toastr.success('Promo code '+ promo.Code + ' successfully added.'); }) .catch(function(err) { $exceptionHandler(err); diff --git a/src/app/cart/js/cart.config.js b/src/app/cart/js/cart.config.js index 2800d5b3..d8974b90 100644 --- a/src/app/cart/js/cart.config.js +++ b/src/app/cart/js/cart.config.js @@ -11,7 +11,7 @@ function CartConfig($stateProvider) { controller: 'CartCtrl', controllerAs: 'cart', data: { - pageTitle: "Shopping Cart" + pageTitle: 'Shopping Cart' }, resolve: { LineItemsList: function($q, $state, toastr, sdkOrderCloud, ocLineItems, CurrentOrder) { @@ -29,7 +29,7 @@ function CartConfig($stateProvider) { } }) .catch(function() { - toastr.error('Your order does not contain any line items.', 'Error'); + toastr.warning('Your order does not contain any line items.'); dfd.reject(); }); return dfd.promise; diff --git a/src/app/cart/js/cart.controller.js b/src/app/cart/js/cart.controller.js index 1a30af13..49367ff0 100644 --- a/src/app/cart/js/cart.controller.js +++ b/src/app/cart/js/cart.controller.js @@ -12,7 +12,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList .then(function () { $rootScope.$broadcast('OC:UpdateOrder', order.ID); vm.lineItems.Items.splice(scope.$index, 1); - toastr.success('Line Item Removed'); + toastr.success(scope.lineItem.Product.Name + ' was removed from your shopping cart.'); }); }; @@ -33,7 +33,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList .then(function() { sdkOrderCloud.Orders.Delete('outgoing', order.ID) .then(function(){ - $state.go("home",{}, {reload:'base'}) + $state.go('home', {}, {reload:'base'}); }); }); }; diff --git a/src/app/checkout/js/checkout.controller.js b/src/app/checkout/js/checkout.controller.js index ef83e9fe..015476be 100644 --- a/src/app/checkout/js/checkout.controller.js +++ b/src/app/checkout/js/checkout.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CheckoutCtrl', CheckoutController) ; -function CheckoutController($state, $rootScope, toastr, sdkOrderCloud, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { +function CheckoutController($exceptionHandler, $state, $rootScope, toastr, sdkOrderCloud, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { var vm = this; vm.shippingAddress = OrderShipAddress; vm.billingAddress = OrderBillingAddress; @@ -13,10 +13,11 @@ function CheckoutController($state, $rootScope, toastr, sdkOrderCloud, OrderShip sdkOrderCloud.Orders.Submit('outgoing', order.ID) .then(function(order) { $state.go('confirmation', {orderid:order.ID}, {reload:'base'}); - toastr.success('Your order has been submitted', 'Success'); + toastr.success('Your order was successfully submitted.'); }) .catch(function(ex) { - toastr.error('Your order did not submit successfully.', 'Error'); + toastr.error('Something went wrong with your order submission.', 'Error'); + $exceptionHandler(ex); }); }; @@ -38,7 +39,7 @@ function CheckoutController($state, $rootScope, toastr, sdkOrderCloud, OrderShip sdkOrderCloud.Orders.RemovePromotion('outgoing', order.ID, promotion.Code) .then(function() { $rootScope.$broadcast('OC:UpdatePromotions', order.ID); - }) + }); }; $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { @@ -50,6 +51,6 @@ function CheckoutController($state, $rootScope, toastr, sdkOrderCloud, OrderShip vm.promotions = data; } $rootScope.$broadcast('OC:UpdateOrder', orderid); - }) + }); }); } \ No newline at end of file diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js index 50023c46..efdca8f4 100644 --- a/src/app/checkout/payment/directives/js/creditCard.controller.js +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('PaymentCreditCardCtrl', PaymentCreditCardController) ; -function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocMyCreditCards, ocCheckoutPaymentService) { +function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, CheckoutConfig, sdkOrderCloud, ocMyCreditCards, ocCheckoutPaymentService) { var creditCardListOptions = { page: 1, pageSize: 100 @@ -64,7 +64,7 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand }); }; - $scope.$watch('payment', function(n,o) { + $scope.$watch('payment', function(n) { if (n && !n.CreditCardID || n.Editing) { $scope.OCPaymentCreditCard.$setValidity('CreditCardNotSet', false); } else { @@ -81,7 +81,7 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand $scope.createCreditCard = function() { ocMyCreditCards.Create() .then(function(card) { - toastr.success('Credit Card Created', 'Success'); + toastr.success('Credit card ending in ' + card.PartialAccountNumber + ' was saved.'); $scope.creditCards.push(card); $scope.updatePayment({creditCard:card}); }); diff --git a/src/app/checkout/payment/directives/js/payments.controller.js b/src/app/checkout/payment/directives/js/payments.controller.js index 70809998..c749fc74 100644 --- a/src/app/checkout/payment/directives/js/payments.controller.js +++ b/src/app/checkout/payment/directives/js/payments.controller.js @@ -4,7 +4,7 @@ angular.module('orderCloud') //TODO: Refactor for multiple payments without Payments.Patch -function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { +function PaymentsController($rootScope, $scope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) @@ -48,7 +48,7 @@ function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOr .then(function(){ $scope.payments.Items.splice(scope.$index, 1); calculateMaxTotal(); - return toastr.success('Payment Removed'); + return toastr.success('Payment removed.'); }); }; @@ -57,7 +57,7 @@ function PaymentsController($rootScope, $scope, $exceptionHandler, toastr, sdkOr //TODO: Buyer Users currently cannot patch a payment - we need to refactor for multiple payments sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, scope.payment) .then(function(data) { - toastr.success('Payment Amount Updated'); + toastr.success('Payment amount updated to ' + $filter('currency')(scope.payment.Amount)); calculateMaxTotal(); }) .catch(function(ex) { diff --git a/src/app/checkout/payment/js/payment.controller.js b/src/app/checkout/payment/js/payment.controller.js index b635104b..56e64988 100644 --- a/src/app/checkout/payment/js/payment.controller.js +++ b/src/app/checkout/payment/js/payment.controller.js @@ -10,7 +10,7 @@ function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, sdkOrd function createAddress(order){ return ocMyAddresses.Create() .then(function(address) { - toastr.success('Address Created', 'Success'); + toastr.success(address.AddressName + ' was created.'); order.BillingAddressID = address.ID; saveBillingAddress(order); }); diff --git a/src/app/checkout/review/js/review.config.js b/src/app/checkout/review/js/review.config.js index fd586624..7655f423 100644 --- a/src/app/checkout/review/js/review.config.js +++ b/src/app/checkout/review/js/review.config.js @@ -25,7 +25,7 @@ function CheckoutReviewConfig($stateProvider) { } }) .catch(function() { - toastr.error('Your order does not contain any line items.', 'Error'); + toastr.warning('Your order does not contain any line items.'); dfd.reject(); }); return dfd.promise; diff --git a/src/app/checkout/shipping/js/shipping.controller.js b/src/app/checkout/shipping/js/shipping.controller.js index d7209746..5e250b4f 100644 --- a/src/app/checkout/shipping/js/shipping.controller.js +++ b/src/app/checkout/shipping/js/shipping.controller.js @@ -15,7 +15,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, sdkOr function createAddress(order) { ocMyAddresses.Create() .then(function(address) { - toastr.success('Address Created', 'Success'); + toastr.success(address.AddressName + ' was created.'); order.ShippingAddressID = address.ID; vm.saveShipAddress(order); }); @@ -30,7 +30,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, sdkOr order.ShippingAddressID = address.ID; vm.saveShipAddress(order); } - }) + }); } function saveShipAddress(order) { diff --git a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js index 1847a333..c8f7d728 100644 --- a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js +++ b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .directive('ocQuantityInput', OCQuantityInput) ; -function OCQuantityInput($rootScope, toastr, sdkOrderCloud) { +function OCQuantityInput($log, $rootScope, toastr, sdkOrderCloud) { return { scope: { product: '=', @@ -16,10 +16,10 @@ function OCQuantityInput($rootScope, toastr, sdkOrderCloud) { link: function (scope) { if (scope.product) { scope.item = scope.product; - scope.content = "product" + scope.content = 'product'; } else if (scope.lineitem) { scope.item = scope.lineitem; - scope.content = "lineitem"; + scope.content = 'lineitem'; scope.updateQuantity = function () { if (scope.item.Quantity > 0) { sdkOrderCloud.LineItems.Patch('outgoing', scope.order.ID, scope.item.ID, { @@ -29,16 +29,15 @@ function OCQuantityInput($rootScope, toastr, sdkOrderCloud) { data.Product = scope.lineitem.Product; scope.item = data; scope.lineitem = data; - if (typeof scope.onUpdate === "function") scope.onUpdate(scope.lineitem); - toastr.success('Quantity Updated'); + if (typeof scope.onUpdate === 'function') scope.onUpdate(scope.lineitem); + toastr.success(data.Product.Name + ' quantity updated to ' + data.Quantity); $rootScope.$broadcast('OC:UpdateOrder', scope.order.ID, 'Calculating Order Total'); }); } - } + }; } else { - toastr.error('Please input either a product or lineitem attribute in the directive', 'Error'); - console.error('Please input either a product or lineitem attribute in the quantityInput directive '); + $log.error('oc-quantity-input error: ocQuantityInput requires either a product or lineitem attribute in order to work properly.'); } } - } + }; } \ No newline at end of file diff --git a/src/app/favoriteOrders/js/favoriteOrders.component.js b/src/app/favoriteOrders/js/favoriteOrders.component.js index a1012890..896f1026 100644 --- a/src/app/favoriteOrders/js/favoriteOrders.component.js +++ b/src/app/favoriteOrders/js/favoriteOrders.component.js @@ -38,7 +38,7 @@ function FavoriteOrderController(toastr, sdkOrderCloud){ sdkOrderCloud.Me.Patch({xp: {FavoriteOrders: existingList}}) .then(function(){ vm.isFavorited = true; - toastr.success('Order added to your favorites', 'Success'); + toastr.success('Saved to your favorite orders.'); }); } @@ -48,7 +48,7 @@ function FavoriteOrderController(toastr, sdkOrderCloud){ .then(function(){ vm.isFavorited = false; vm.currentUser.xp.FavoriteOrders = updatedList; - toastr.success('Order removed from your favorites', 'Success'); + toastr.success('Removed from your favorite orders'); }); } } \ No newline at end of file diff --git a/src/app/favoriteProducts/js/favoriteProduct.controller.js b/src/app/favoriteProducts/js/favoriteProduct.controller.js index 6aa08fc2..3fb8a443 100644 --- a/src/app/favoriteProducts/js/favoriteProduct.controller.js +++ b/src/app/favoriteProducts/js/favoriteProduct.controller.js @@ -51,7 +51,7 @@ function FavoriteProductController($scope, sdkOrderCloud, toastr){ .then(function(data){ vm.hasFavorites = data.xp && data.xp.FavoriteProducts; vm.isFavorited = true; - toastr.success($scope.product.Name + ' was added to your favorites'); + toastr.success($scope.product.Name + ' was added to your favorite products.'); }); } @@ -61,7 +61,7 @@ function FavoriteProductController($scope, sdkOrderCloud, toastr){ .then(function(){ vm.isFavorited = false; $scope.currentUser.xp.FavoriteProducts = updatedList; - toastr.success($scope.product.Name + ' was removed from your favorites'); + toastr.success($scope.product.Name + ' was removed from your favorite products.'); }); } diff --git a/src/app/login/js/login.service.js b/src/app/login/js/login.service.js index aa63527d..ff87c865 100644 --- a/src/app/login/js/login.service.js +++ b/src/app/login/js/login.service.js @@ -80,7 +80,7 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrde $state.go('home'); }) .catch(function () { - toastr.error('Your token has expired, please log in again.'); + toastr.error('Your session has expired, please log in again.'); _logout(); }); } else { diff --git a/src/app/myAddresses/js/myAddresses.controller.js b/src/app/myAddresses/js/myAddresses.controller.js index 767502a1..0c892550 100644 --- a/src/app/myAddresses/js/myAddresses.controller.js +++ b/src/app/myAddresses/js/myAddresses.controller.js @@ -8,7 +8,7 @@ function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, vm.create = function() { ocMyAddresses.Create() .then(function(data) { - toastr.success('Address Created', 'Success'); + toastr.success(data.AddressName + ' was created.'); vm.list.Items.push(data); }); }; @@ -16,7 +16,7 @@ function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, vm.edit = function(scope){ ocMyAddresses.Edit(scope.address) .then(function(data) { - toastr.success('Address Saved', 'Success'); + toastr.success(data.AddressName + ' was saved.'); vm.list.Items[scope.$index] = data; }); }; @@ -30,9 +30,9 @@ function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, .then(function() { vm.loading[scope.$index] = sdkOrderCloud.Me.DeleteAddress(scope.address.ID) .then(function() { - toastr.success('Address Deleted', 'Success'); + toastr.success(scope.AddressName + ' was deleted.'); vm.list.Items.splice(scope.$index, 1); - }) + }); }) .catch(function() { diff --git a/src/app/myOrders/approvals/js/approvals.controller.js b/src/app/myOrders/approvals/js/approvals.controller.js index 3deaa26c..43bf9047 100644 --- a/src/app/myOrders/approvals/js/approvals.controller.js +++ b/src/app/myOrders/approvals/js/approvals.controller.js @@ -46,7 +46,7 @@ function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalIn function submit(){ return sdkOrderCloud.Orders[vm.intent]('outgoing', vm.orderid, {comments: vm.comments}) .then(function(){ - toastr.success('Order ' + vm.intent + 'd'); + toastr.success('Order ' + vm.intent.toLowerCase() + 'd'); $uibModalInstance.close(); }) .catch(function(ex){ diff --git a/src/app/myPayments/js/myPayments.controller.js b/src/app/myPayments/js/myPayments.controller.js index 91a60614..93ecb88b 100644 --- a/src/app/myPayments/js/myPayments.controller.js +++ b/src/app/myPayments/js/myPayments.controller.js @@ -11,7 +11,7 @@ function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, vm.createCreditCard = function(){ ocMyCreditCards.Create() .then(function(data) { - toastr.success('Credit Card Created', 'Success'); + toastr.success('Credit card ending in ' + data.PartialAccountNumber + ' was saved.'); vm.personalCreditCards.Items.push(data); }); }; @@ -19,7 +19,7 @@ function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, vm.edit = function(scope){ ocMyCreditCards.Edit(scope.creditCard) .then(function(data){ - toastr.success('Credit Card Updated', 'Success'); + toastr.success('Credit card ending in ' + data.PartialAccountNumber + ' was updated.'); vm.personalCreditCards.Items[scope.$index] = data; }); }; @@ -33,7 +33,7 @@ function MyPaymentsController($q, $state, toastr, $exceptionHandler, ocConfirm, .then(function(){ vm.loading[scope.$index] = ocAuthNet.DeleteCreditCard(scope.creditCard) .then(function(){ - toastr.success('Credit Card Deleted', 'Success'); + toastr.success('Credit card ending in ' + scope.creditCard.PartialAccountNumber + ' was deleted.'); vm.personalCreditCards.Items.splice(scope.$index, 1); }) .catch(function(error) { diff --git a/src/app/productDetail/js/productDetail.controller.js b/src/app/productDetail/js/productDetail.controller.js index ddb2fe90..44fb96c2 100644 --- a/src/app/productDetail/js/productDetail.controller.js +++ b/src/app/productDetail/js/productDetail.controller.js @@ -10,7 +10,7 @@ function ProductDetailController($exceptionHandler, Product, CurrentOrder, ocLin vm.addToCart = function() { ocLineItems.AddItem(CurrentOrder, vm.item) .then(function(){ - toastr.success('Product added to cart', 'Success') + toastr.success('Product successfully added to your cart.'); }) .catch(function(error){ $exceptionHandler(error); diff --git a/src/app/productQuickView/js/productQuickView.controller.js b/src/app/productQuickView/js/productQuickView.controller.js index 221e37ab..8a617160 100644 --- a/src/app/productQuickView/js/productQuickView.controller.js +++ b/src/app/productQuickView/js/productQuickView.controller.js @@ -8,7 +8,7 @@ function ProductQuickViewController(toastr, $uibModalInstance, SelectedProduct, vm.addToCart = function() { ocLineItems.AddItem(CurrentOrder, vm.item) .then(function(){ - toastr.success('Product added to cart', 'Success'); + toastr.success('Product successfully added to your cart.'); $uibModalInstance.close(); }); }; diff --git a/src/app/repeatOrder/js/repeatOrder.controller.js b/src/app/repeatOrder/js/repeatOrder.controller.js index f402df3f..191054c6 100644 --- a/src/app/repeatOrder/js/repeatOrder.controller.js +++ b/src/app/repeatOrder/js/repeatOrder.controller.js @@ -2,11 +2,11 @@ angular.module('orderCloud') .controller('RepeatOrderCtrl', RepeatOrderCtrl) ; -function RepeatOrderCtrl(toastr, ocRepeatOrder, $uibModal) { +function RepeatOrderCtrl($log, ocRepeatOrder, $uibModal) { var vm = this; vm.$onInit = function() { - if (vm.orderid === 'undefined') toastr.error('repeat order component is not configured correctly. orderid is a required attribute', 'Error'); + if (vm.orderid === 'undefined') $log.error('Repeat order error: repeat order component is not configured correctly. orderid is a required attribute'); }; vm.openReorderModal = function(){ diff --git a/src/app/repeatOrder/js/repeatOrder.service.js b/src/app/repeatOrder/js/repeatOrder.service.js index 13a81fe9..76ec0a82 100644 --- a/src/app/repeatOrder/js/repeatOrder.service.js +++ b/src/app/repeatOrder/js/repeatOrder.service.js @@ -75,7 +75,7 @@ function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, $q.all(queue) .then(function(){ dfd.resolve(); - toastr.success('Product(s) Add to Cart', 'Success'); + toastr.success('Products successfully add to your cart.'); }) .catch(function(error){ $exceptionHandler(error); From 5713942bcbeb182fe70cdc6b31463a2e76265d44 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:00:21 -0500 Subject: [PATCH 087/158] OC-2055 - add panel wrapper around repeat-order LI table --- .../templates/repeatOrder.modal.html | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/repeatOrder/templates/repeatOrder.modal.html b/src/app/repeatOrder/templates/repeatOrder.modal.html index 43723fa5..2a8f6f86 100644 --- a/src/app/repeatOrder/templates/repeatOrder.modal.html +++ b/src/app/repeatOrder/templates/repeatOrder.modal.html @@ -14,20 +14,22 @@ <h3 class="modal-title">Reorder</h3> <div class="alert alert-warning"> <strong>Warning</strong> The following line items are not available for reorder, clicking add to cart will <strong>only</strong> add valid line items. </div> - <table class="table table-striped table-bordered"> - <thead class="thead-inverse"> - <tr> - <th>Product ID</th> - <th>Quantity</th> - </tr> - </thead> - <tbody> - <tr ng-repeat="li in repeatModal.invalidLI track by $index"> - <td>{{li.ProductID}}</td> - <td>{{li.Quantity}}</td> - </tr> - </tbody> - </table> + <div class="panel panel-default table-responsive"> + <table class="table table-striped table-bordered"> + <thead class="thead-inverse"> + <tr> + <th>Product ID</th> + <th>Quantity</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="li in repeatModal.invalidLI track by $index"> + <td>{{li.ProductID}}</td> + <td>{{li.Quantity}}</td> + </tr> + </tbody> + </table> + </div> </div> </div> <div class="modal-footer"> From 7f2816ac9b7fa9936a257c69188b58b70beb073e Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 7 Apr 2017 14:06:16 -0500 Subject: [PATCH 088/158] OC-2045 Order History list view: Filtering, Date Range, Table layout --- src/app/base/templates/navigation.html | 2 +- src/app/myOrders/orders/js/orders.config.js | 2 +- .../myOrders/orders/js/orders.controller.js | 28 ++------------- src/app/myOrders/orders/js/orders.service.js | 35 ++++++++----------- src/app/myOrders/orders/templates/orders.html | 30 +++++----------- 5 files changed, 29 insertions(+), 68 deletions(-) diff --git a/src/app/base/templates/navigation.html b/src/app/base/templates/navigation.html index 35a0689b..fab1b3de 100644 --- a/src/app/base/templates/navigation.html +++ b/src/app/base/templates/navigation.html @@ -35,7 +35,7 @@ <li ui-sref-active="active"><a ui-sref="myAddresses">Personal Addresses</a></li> <li ui-sref-active="active"><a ui-sref="myPayments">Payment Methods</a></li> <li ui-sref-active="active"><a ui-sref="favoriteProducts">Favorite Products</a></li> - <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"><a ui-sref="orders">Orders</a></li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"><a ui-sref="orders({tab: 'history'})">Orders</a></li> <li class="divider"></li> <li><a ng-click="application.logout()">Log out</a></li> </ul> diff --git a/src/app/myOrders/orders/js/orders.config.js b/src/app/myOrders/orders/js/orders.config.js index 235218a1..71198d88 100644 --- a/src/app/myOrders/orders/js/orders.config.js +++ b/src/app/myOrders/orders/js/orders.config.js @@ -12,7 +12,7 @@ function OrdersConfig($stateProvider) { data: { pageTitle: 'Orders' }, - url: '/orders?from&to&search&page&pageSize&searchOn&sortBy&tab?status', + url: '/orders/:tab?fromDate&toDate&search&page&pageSize&searchOn&sortBy&filters', resolve: { Parameters: function($stateParams, ocParameters){ return ocParameters.Get($stateParams); diff --git a/src/app/myOrders/orders/js/orders.controller.js b/src/app/myOrders/orders/js/orders.controller.js index b642e93c..232538c9 100644 --- a/src/app/myOrders/orders/js/orders.controller.js +++ b/src/app/myOrders/orders/js/orders.controller.js @@ -5,10 +5,9 @@ angular.module('orderCloud') function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters, ocOrders, OrderList, Parameters) { var vm = this; vm.list = OrderList; + if (Parameters.fromDate) Parameters.fromDate = new Date(Parameters.fromDate); + if (Parameters.toDate) Parameters.toDate = new Date(Parameters.toDate); vm.parameters = Parameters; - //need this here to display in uib-datepicker (as date obj) but short date (string) in url - vm.fromDate = Parameters.fromDate; - vm.toDate = Parameters.toDate; vm.orderStatuses = [ {Value: 'Open', Name: 'Open'}, @@ -27,8 +26,6 @@ function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters */ vm.filter = filter; //Reload the state with new parameters vm.today = Date.now(); - vm.clearFrom = clearFrom; //clears from parameters and resets page - vm.clearTo = clearTo; //clears to parameter and resets page vm.search = search; //Reload the state with new search parameter & reset the vm.clearSearch = clearSearch; //Clear the search parameter, reload the state & reset the page vm.updateSort = updateSort; //Conditionally set, reverse, remove the sortBy parameter & reload the state @@ -36,7 +33,6 @@ function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters vm.pageChanged = pageChanged; //Reload the state with the incremented page parameter vm.loadMore = loadMore; //Load the next page of results with all of the same parameters, used on mobile - vm.formatDate = formatDate; vm.selectTab = selectTab; vm.goToOrder = goToOrder; @@ -54,33 +50,15 @@ function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters } function filter(resetPage) { - formatDate(); $state.go('.', ocParameters.Create(vm.parameters, resetPage)); } - - function clearFrom(){ - vm.parameters.from = null; - vm.fromDate = null; - vm.filter(true); - } - - function clearTo(){ - vm.parameters.to = null; - vm.toDate = null; - vm.filter(true); - } - - function formatDate(){ - //formats date as string to display in url - if(vm.fromDate) vm.parameters.from = $filter('date')(angular.copy(vm.fromDate), 'MM-dd-yyyy'); - if(vm.toDate) vm.parameters.to = $filter('date')(angular.copy(vm.toDate), 'MM-dd-yyyy'); - } function search() { vm.filter(true); } function clearSearch() { + vm.searchResults = false; vm.parameters.search = null; vm.filter(true); } diff --git a/src/app/myOrders/orders/js/orders.service.js b/src/app/myOrders/orders/js/orders.service.js index 76b15af1..1b64b04f 100644 --- a/src/app/myOrders/orders/js/orders.service.js +++ b/src/app/myOrders/orders/js/orders.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrders', ocOrdersService) ; -function ocOrdersService(sdkOrderCloud){ +function ocOrdersService($filter, sdkOrderCloud){ var service = { List: _list }; @@ -13,32 +13,27 @@ function ocOrdersService(sdkOrderCloud){ //exclude unsubmitted orders from list //parameters.filters = {Status: '!Unsubmitted'}; //TODO: Uncomment this line when API ! is fixed - //set outgoing params to iso8601 format as expected by api - //set returning params to date object as expected by uib-datepicker - if(parameters.from) { - var fromDateObj = new Date(parameters.from); - Parameters.fromDate = fromDateObj; - parameters.from = (fromDateObj).toISOString(); - } - if(parameters.to) { - var toDateObj = new Date(parameters.to); - Parameters.toDate = toDateObj; - parameters.to = (toDateObj).toISOString(); + function convertToDate(toDate) { + var result = new Date(toDate); + result = result.setDate(result.getDate() + 1); + return $filter('date')(result, 'MM-dd-yyyy'); } - // DateSubmitted calculated with from/to parameters - if(parameters.from && parameters.to) { - parameters.filters.DateSubmitted = [('>' + parameters.from), ('<' + parameters.to)]; - } else if(parameters.from && !parameters.to) { - parameters.filters.DateSubmitted = [('>' + parameters.from)]; - } else if (!parameters.from && parameters.to) { - parameters.filters.DateSubmitted = [('<' + parameters.to)]; + if (parameters.fromDate && parameters.toDate) { + parameters.filters.DateSubmitted = [('>' + parameters.fromDate), ('<' + convertToDate(parameters.toDate))]; + } else if(parameters.fromDate && !parameters.toDate) { + parameters.filters.DateSubmitted = [('>' + parameters.fromDate)]; + } else if (!parameters.fromDate && parameters.toDate) { + parameters.filters.DateSubmitted = [('<' + convertToDate(parameters.toDate))]; } if(parameters.tab === 'favorites') { - if(CurrentUser.xp && CurrentUser.xp.FavoriteOrders) { + if (CurrentUser.xp && CurrentUser.xp.FavoriteOrders) { angular.extend(parameters.filters, {ID: CurrentUser.xp.FavoriteOrders.join('|')}); } + else { + angular.extend(parameters.filters, {ID: ''}); + } } if(parameters.status){ diff --git a/src/app/myOrders/orders/templates/orders.html b/src/app/myOrders/orders/templates/orders.html index 4f1b9ca5..c24b89f3 100644 --- a/src/app/myOrders/orders/templates/orders.html +++ b/src/app/myOrders/orders/templates/orders.html @@ -30,31 +30,21 @@ <h3 class="l-page-header__title"> <!--====== FILTERS ======--> <form name="OrdersFiltersForm"> <div class="row"> - <div class="col-sm-3 form-group"> + <div class="col-sm-4 form-group"> <label for="Status">Status</label> <select id="Status" class="form-control" ng-model="orders.parameters.status" ng-options="status.Value as status.Name for status in orders.orderStatuses" ng-change="orders.filter(true)"> <option value="">All</option> </select> </div> - <div class="col-sm-3 form-group"> + <div class="col-sm-4 form-group"> <label for="FromDate">From Date</label> - <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.fromDate" ng-blur="orders.filter(true)"> - <div class="input-group" ng-if="!application.isTouchDevice"> - <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> - <span class="input-group-btn" ng-if="orders.fromDate"> - <button class="btn btn-default" ng-click="orders.clearFrom()" type="button"><i class="fa fa-times text-danger"></i></button> - </span> - </div> + <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.parameters.fromDate" ng-blur="orders.filter(true)"> + <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.parameters.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.parameters.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> </div> - <div class="col-sm-3 form-group"> + <div class="col-sm-4 form-group"> <label for="ToDate">To Date</label> - <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.toDate" ng-blur="orders.filter(true)"> - <div class="input-group" ng-if="!application.isTouchDevice"> - <input id="ToDate" type="text" class="form-control" ng-model="orders.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.fromDate, maxDate: orders.today}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> - <span class="input-group-btn" ng-if="orders.toDate"> - <button class="btn btn-default" ng-click="orders.clearTo()" type="button"><i class="fa fa-times text-danger"></i></button> - </span> - </div> + <input ng-if="application.isTouchDevice" type="date" class="form-control" ng-model="orders.parameters.toDate" ng-blur="orders.filter(true)"> + <input id="ToDate" type="text" class="form-control" ng-model="orders.parameters.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.parameters.fromDate, maxDate: orders.today}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> </div> </div> </form> @@ -104,10 +94,8 @@ <h3 class="l-page-header__title"> <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'DateSubmitted'"></i> <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!DateSubmitted'"></i> </th> - <th ng-click="orders.updateSort('FromUserFirstName')"> + <th> Submitted By - <i class="fa fa-caret-down" ng-show="orders.parameters.sortBy == 'FromUserFirstName'"></i> - <i class="fa fa-caret-up" ng-show="orders.parameters.sortBy == '!FromUserFirstName'"></i> </th> <th ng-click="orders.updateSort('Subtotal')"> Subtotal @@ -121,7 +109,7 @@ <h3 class="l-page-header__title"> <td><a ng-click="orders.goToOrder(order)">{{order.ID}}</a></td> <td>{{order.Status | humanize}}</td> <td>{{(order.DateSubmitted || order.DateCreated) | date:'short'}}</td> - <td>{{order.FromUserFirstName + ' ' + order.FromUserLastName}}</td> + <td>{{order.FromUser.FirstName + ' ' + order.FromUser.LastName}}</td> <td>{{order.Subtotal | currency}}</td> </tr> </tbody> From 3c98e47e8a32de357459ac4ab98b1cff37bebb56 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:06:53 -0500 Subject: [PATCH 089/158] OC-2059 - Use btn-danger instead of btn-default.text-danger --- src/app/cart/templates/cart.html | 3 +-- .../payment/directives/templates/payments.html | 4 ++-- .../oc-file-upload/oc-file-upload.html | 16 ++++++++-------- .../directives/oc-file-upload/oc-file-upload.js | 14 ++++++++------ src/app/myOrders/orders/templates/orders.html | 4 ++-- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/app/cart/templates/cart.html b/src/app/cart/templates/cart.html index 6e8d047e..2816b44d 100644 --- a/src/app/cart/templates/cart.html +++ b/src/app/cart/templates/cart.html @@ -1,8 +1,7 @@ <article> <h3> <div class="pull-right"> - <button ng-if="cart.lineItems.Items.length" ng-click="cart.cancelOrder(base.currentOrder)" class="btn btn-default"><span class="text-danger">Cancel Order</span> - </button> + <button ng-if="cart.lineItems.Items.length" ng-click="cart.cancelOrder(base.currentOrder)" class="btn btn-danger">Cancel Order</button> <button ui-sref="productBrowse.products" class="btn btn-default">Continue Shopping</button> </div> Shopping Cart diff --git a/src/app/checkout/payment/directives/templates/payments.html b/src/app/checkout/payment/directives/templates/payments.html index b180bf21..0f43772d 100644 --- a/src/app/checkout/payment/directives/templates/payments.html +++ b/src/app/checkout/payment/directives/templates/payments.html @@ -10,8 +10,8 @@ <oc-payment order="order" payment="payment" methods="methods" payment-index="$index" exclude-options="excludeOptions"></oc-payment> </div> <div class="col-xs-2 col-sm-1 text-right" ng-if="payments.Items.length > 1"> - <button type="button" class="btn btn-default" ng-click="removePayment(this)" uib-tooltip="Remove Payment" tooltip-placement="left"> - <i class="fa fa-trash-o text-danger"></i> + <button type="button" class="btn btn-danger" ng-click="removePayment(this)" uib-tooltip="Remove Payment" tooltip-placement="left"> + <i class="fa fa-trash-o"></i> <span class="sr-only">Remove Payment</span> </button> </div> diff --git a/src/app/common/directives/oc-file-upload/oc-file-upload.html b/src/app/common/directives/oc-file-upload/oc-file-upload.html index 104dba58..8654475c 100644 --- a/src/app/common/directives/oc-file-upload/oc-file-upload.html +++ b/src/app/common/directives/oc-file-upload/oc-file-upload.html @@ -1,14 +1,14 @@ <div ng-class="{'has-error': invalidExtension}"> - <figure class="row"> - <div class="col-xs-8 col-sm-5"> - <img class="img-responsive" ng-src="{{model.xp.image.URL || 'http://placehold.it/300x300'}}" alt="Product Image"> - </div> + <figure ng-show="model.xp.image.URL"> + <img class="img-responsive" style="max-height:500px;" ng-src="{{model.xp.image.URL}}" alt="Product Image"> </figure> <div> - <br> - <button type="button" class="btn btn-default" ng-click="upload()">{{model.xp.image.URL ? 'Replace Image' : 'Upload'}}</button> - <button type="button" class="btn btn-danger" ng-click="remove()" ng-if="model.xp.image.URL "><i class="fa fa-trash"></i></button> + <br ng-if="model.xp.image.URL && !invalidExtension"> + <button type="button" class="btn btn-default" ng-class="{'btn-block':!model.xp.image.URL}" ng-click="upload()">{{model.xp.image.URL ? 'Replace file' : (uploadText || 'Upload an image')}}</button> + <button type="button" class="btn btn-danger" ng-click="remove()" ng-if="model.xp.image.URL"> + <i class="fa fa-trash"></i> + </button> </div> <input class="ng-hide" name="upload" type="file" id="orderCloudUpload" /> - <span class="help-block error-msg" ng-show="invalidExtension">Invalid File Type</span> + <span class="help-block error-msg" ng-show="invalidExtension">Invalid file type, please select another file.</span> </div> \ No newline at end of file diff --git a/src/app/common/directives/oc-file-upload/oc-file-upload.js b/src/app/common/directives/oc-file-upload/oc-file-upload.js index 18de4d7f..4ab49d86 100644 --- a/src/app/common/directives/oc-file-upload/oc-file-upload.js +++ b/src/app/common/directives/oc-file-upload/oc-file-upload.js @@ -9,7 +9,8 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { model: '=', extensions: '@', invalidExtension: '@', - patch: '&' + patch: '&', + uploadText: '=' }, restrict: 'E', templateUrl: 'common/directives/oc-file-upload/oc-file-upload.html', @@ -17,7 +18,7 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { link: link }; - function link(scope, element, attrs) { + function link(scope, element, attrs, formCtrl) { var file_input = $parse('file'); var el = element; scope.invalidExtension = false; @@ -27,7 +28,8 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { }; scope.remove = function() { - delete scope.model.xp.image.URL; + scope.invalidExtension = false; + if (scope.model.xp && scope.model.xp.image) delete scope.model.xp.image; }; function afterSelection(file, fileName) { @@ -46,7 +48,7 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { }; if (scope.extensions) { var items = _.map(scope.extensions.split(','), function(ext) { - return ext.replace(/ /g ,'').replace(/\./g, '').toLowerCase(); + return ext.replace(/ /g, '').replace(/\./g, '').toLowerCase(); }); angular.forEach(items, function(item) { if (item.indexOf('/') > -1) { @@ -74,6 +76,7 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { valid = (allowed.Extensions.indexOf(ext) != -1 || allowed.Types.indexOf(event.target.files[0].type.split('/')[0]) > -1); } if (valid) { + scope.invalidExtension = false; scope.$apply(function() { ocFileReader.ReadAsDataUrl(event.target.files[0], scope) .then(function() { @@ -88,8 +91,7 @@ function ordercloudFileUpload($parse, ocFileReader, ocFilesService) { var input; event.target.files[0] = null; el.find('input').replaceWith(input = el.find('input').clone(true)); - if (!scope.model.xp.image) scope.model.xp.image = {}; - scope.model.xp.image.URL = null; + if (scope.model.xp && scope.model.xp.image) scope.model.xp.image = null; }); } break; diff --git a/src/app/myOrders/orders/templates/orders.html b/src/app/myOrders/orders/templates/orders.html index 4f1b9ca5..431ff0c2 100644 --- a/src/app/myOrders/orders/templates/orders.html +++ b/src/app/myOrders/orders/templates/orders.html @@ -42,7 +42,7 @@ <h3 class="l-page-header__title"> <div class="input-group" ng-if="!application.isTouchDevice"> <input id="FromDate" ng-if="!application.isTouchDevice" type="text" class="form-control" ng-model="orders.fromDate" uib-datepicker-popup datepicker-options="{maxDate:orders.toDate}" is-open="fromDate.open" ng-change="orders.filter(true)" ng-click="fromDate.open = !fromDate.open"> <span class="input-group-btn" ng-if="orders.fromDate"> - <button class="btn btn-default" ng-click="orders.clearFrom()" type="button"><i class="fa fa-times text-danger"></i></button> + <button class="btn btn-default" ng-click="orders.clearFrom()" type="button"><i class="fa fa-times"></i></button> </span> </div> </div> @@ -52,7 +52,7 @@ <h3 class="l-page-header__title"> <div class="input-group" ng-if="!application.isTouchDevice"> <input id="ToDate" type="text" class="form-control" ng-model="orders.toDate" uib-datepicker-popup datepicker-options="{minDate:orders.fromDate, maxDate: orders.today}" is-open="toDate.open" ng-change="orders.filter(true)" ng-click="toDate.open = !toDate.open"> <span class="input-group-btn" ng-if="orders.toDate"> - <button class="btn btn-default" ng-click="orders.clearTo()" type="button"><i class="fa fa-times text-danger"></i></button> + <button class="btn btn-default" ng-click="orders.clearTo()" type="button"><i class="fa fa-times"></i></button> </span> </div> </div> From f072303771223a2f4dbda13a033066d4c6434738 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:14:08 -0500 Subject: [PATCH 090/158] OC-2061 - update product search component to use autofocus instead of $timeout --- src/app/productSearch/js/productSearch.modal.controller.js | 6 +----- src/app/productSearch/js/productSearch.service.js | 2 +- src/app/productSearch/templates/productSearch.modal.html | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/productSearch/js/productSearch.modal.controller.js b/src/app/productSearch/js/productSearch.modal.controller.js index 396e5aa7..42a48424 100644 --- a/src/app/productSearch/js/productSearch.modal.controller.js +++ b/src/app/productSearch/js/productSearch.modal.controller.js @@ -2,13 +2,9 @@ angular.module('orderCloud') .controller('ProductSearchModalCtrl', ProductSearchModalController) ; -function ProductSearchModalController($uibModalInstance, $timeout, $scope, sdkOrderCloud, catalogid) { +function ProductSearchModalController($uibModalInstance, $scope, sdkOrderCloud, catalogid) { var vm = this; - $timeout(function() { - $('#ProductSearchInput').focus(); - }, 300); - vm.getSearchResults = function() { var parameters = { catalogID: catalogid, diff --git a/src/app/productSearch/js/productSearch.service.js b/src/app/productSearch/js/productSearch.service.js index 555faca3..16eaf444 100644 --- a/src/app/productSearch/js/productSearch.service.js +++ b/src/app/productSearch/js/productSearch.service.js @@ -14,7 +14,7 @@ function OrderCloudProductSearchService($uibModal) { controller: 'ProductSearchModalCtrl', controllerAs: '$ctrl', size: '-full-screen c-productsearch-modal' - }).result + }).result; } return service; diff --git a/src/app/productSearch/templates/productSearch.modal.html b/src/app/productSearch/templates/productSearch.modal.html index 48a2ddd5..602fc5a7 100644 --- a/src/app/productSearch/templates/productSearch.modal.html +++ b/src/app/productSearch/templates/productSearch.modal.html @@ -6,7 +6,7 @@ <h4 class="modal-title">Search</h4> <form class="c-typeahead__form" name="OrderCloudProductSearch" id="OrderCloudProductSearch" autocomplete="off" autocorrect="off" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)"> <fieldset class="form-group"> <label for="ProductSearchInput" class="sr-only">Search Products</label> - <input type="text" id="ProductSearchInput" class="form-control" ng-model="$ctrl.searchTerm" + <input type="text" autofocus id="ProductSearchInput" class="form-control" ng-model="$ctrl.searchTerm" uib-typeahead="product as product.Name for product in $ctrl.getSearchResults()" typeahead-append-to="'.c-typeahead__results'" typeahead-on-select="$ctrl.onSelect($item.ID)" typeahead-focus-first="false" typeahead-wait-ms="300" typeahead-no-results="noResults" typeahead-loading="loading" typeahead-template-url="productSearch/templates/productSearch.typeahead.html" From e616f82d3f954a9a17085a71e99ae774b87aea94 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:51:37 -0500 Subject: [PATCH 091/158] Remove product search template in favor of inline <script> template --- .../templates/productSearch.component.html | 10 +++++++++- .../productSearch/templates/productSearch.modal.html | 10 +++++++++- .../templates/productSearch.typeahead.html | 5 ----- 3 files changed, 18 insertions(+), 7 deletions(-) delete mode 100644 src/app/productSearch/templates/productSearch.typeahead.html diff --git a/src/app/productSearch/templates/productSearch.component.html b/src/app/productSearch/templates/productSearch.component.html index b4e77a48..0c13dc6f 100644 --- a/src/app/productSearch/templates/productSearch.component.html +++ b/src/app/productSearch/templates/productSearch.component.html @@ -1,4 +1,12 @@ <form name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit> + + <!-- Typeahead Result Template --> + <script type="text/ng-template" id="oc-product-search-result.html"> + <a href tabindex="-1" ng-attr-title="{{match.label}}"> + <span ng-bind-html="'<b>' + (match.model.Name | uibTypeaheadHighlight:query) + '</b>' + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></span> + </a> + </script> + <div class="form-group" ng-class="{open:noResults}"> <input type="search" class="form-control" @@ -12,7 +20,7 @@ typeahead-wait-ms="300" typeahead-no-results="noResults" typeahead-loading="loading" - typeahead-template-url="productSearch/templates/productSearch.typeahead.html" + typeahead-template-url="oc-product-search-result.html" /> <button class="sr-only" type="submit" value="Search"></button> <div class="c-typeahead__results"> diff --git a/src/app/productSearch/templates/productSearch.modal.html b/src/app/productSearch/templates/productSearch.modal.html index 602fc5a7..a8d7292f 100644 --- a/src/app/productSearch/templates/productSearch.modal.html +++ b/src/app/productSearch/templates/productSearch.modal.html @@ -4,12 +4,20 @@ <h4 class="modal-title">Search</h4> </div> <div class="modal-body"> <form class="c-typeahead__form" name="OrderCloudProductSearch" id="OrderCloudProductSearch" autocomplete="off" autocorrect="off" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)"> + + <!-- Typeahead Result Template --> + <script type="text/ng-template" id="oc-product-search-result.html"> + <a href tabindex="-1" ng-attr-title="{{match.label}}"> + <span ng-bind-html="'<b>' + (match.model.Name | uibTypeaheadHighlight:query) + '</b>' + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></span> + </a> + </script> + <fieldset class="form-group"> <label for="ProductSearchInput" class="sr-only">Search Products</label> <input type="text" autofocus id="ProductSearchInput" class="form-control" ng-model="$ctrl.searchTerm" uib-typeahead="product as product.Name for product in $ctrl.getSearchResults()" typeahead-append-to="'.c-typeahead__results'" typeahead-on-select="$ctrl.onSelect($item.ID)" typeahead-focus-first="false" typeahead-wait-ms="300" typeahead-no-results="noResults" - typeahead-loading="loading" typeahead-template-url="productSearch/templates/productSearch.typeahead.html" + typeahead-loading="loading" typeahead-template-url="oc-product-search-result.html" /> </fieldset> <button class="sr-only" type="submit" value="Search"></button> diff --git a/src/app/productSearch/templates/productSearch.typeahead.html b/src/app/productSearch/templates/productSearch.typeahead.html deleted file mode 100644 index 49b0014b..00000000 --- a/src/app/productSearch/templates/productSearch.typeahead.html +++ /dev/null @@ -1,5 +0,0 @@ -<a href - tabindex="-1" - ng-attr-title="{{match.label}}"> - <h4 ng-bind-html="(match.model.Name | uibTypeaheadHighlight:query) + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></h4> -</a> \ No newline at end of file From 1f0f074f76edcf98b6133c54d31836f8f5d854d0 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:51:57 -0500 Subject: [PATCH 092/158] Allow the full screen modal-content to overflow-y:auto --- src/app/styles/components/_modals.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/styles/components/_modals.less b/src/app/styles/components/_modals.less index 98499e4b..0951de92 100644 --- a/src/app/styles/components/_modals.less +++ b/src/app/styles/components/_modals.less @@ -12,6 +12,7 @@ border: none; padding: 0; height: 100vh; + overflow-y:auto; } } } From 1b156038d15daa371a5ba31505268401b23913ee Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Fri, 7 Apr 2017 14:52:14 -0500 Subject: [PATCH 093/158] Remove product description from card.product.html --- src/app/common/templates/card.product.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/common/templates/card.product.html b/src/app/common/templates/card.product.html index 10b80df7..6d23de1a 100644 --- a/src/app/common/templates/card.product.html +++ b/src/app/common/templates/card.product.html @@ -6,9 +6,6 @@ <span class="pull-right c-product-card__price"><b class="text-primary">{{product.PriceSchedule.PriceBreaks[0].Price | currency}}</b> <small class="text-muted">x {{product.PriceSchedule.PriceBreaks[0].Quantity}}</small></span> </div> <h4 class="c-product-card__name" ng-class="">{{product.Name || product.ID}}</h4> - <div class="c-product-card__descrip hidden-xs" ng-if="product.Description" > - <p>{{product.Description | limitTo: 40}}{{product.Description.length > 40 ? '...' : ''}}</p> - </div> <div class="text-right c-product-card__icons hidden-xs" oc-prevent-click> <ordercloud-product-quick-view product="product" current-order="base.currentOrder"></ordercloud-product-quick-view> <ordercloud-favorite-product product="product" current-user="base.currentUser"></ordercloud-favorite-product> From 9befea2fa76543916b909efb12d7dc87ce7fe2cc Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 7 Apr 2017 14:53:08 -0500 Subject: [PATCH 094/158] OC-2046 Order History detail: add shipments tab --- .../order/templates/orderDetails.html | 8 +- .../shipments/js/orderShipments.config.js | 21 +++++ .../shipments/js/orderShipments.controller.js | 30 ++++++ .../shipments/js/orderShipments.service.js | 79 ++++++++++++++++ .../shipments/templates/orderShipments.html | 92 +++++++++++++++++++ 5 files changed, 226 insertions(+), 4 deletions(-) create mode 100644 src/app/myOrders/shipments/js/orderShipments.config.js create mode 100644 src/app/myOrders/shipments/js/orderShipments.controller.js create mode 100644 src/app/myOrders/shipments/js/orderShipments.service.js create mode 100644 src/app/myOrders/shipments/templates/orderShipments.html diff --git a/src/app/myOrders/order/templates/orderDetails.html b/src/app/myOrders/order/templates/orderDetails.html index c7d75a6c..b05491bd 100644 --- a/src/app/myOrders/order/templates/orderDetails.html +++ b/src/app/myOrders/order/templates/orderDetails.html @@ -17,14 +17,14 @@ <h3 class="l-page-header__title"> <!--TODO: bring these back in as they become available--> <!--<li ui-sref-active="active"> <a href="" ui-sref=".payments"><i class="fa fa-dollar"></i> Payments</a> - </li> + </li>--> <li ui-sref-active="active"> <a href="" ui-sref=".shipments"><i class="fa fa-truck"></i> Shipments</a> - </li>--> + </li> <!-- TODO: these roles seem incorrect in the api - fix when this is adjusted there --> - <li ui-sref-active="active" oc-if-roles="['ApprovalRuleAdmin', 'AddressReader']"> + <!--<li ui-sref-active="active" oc-if-roles="['ApprovalRuleAdmin', 'AddressReader']"> <a href="" ui-sref=".approvals"><i class="fa fa-check-square-o"></i> Approvals</a> - </li> + </li>--> </ul> <br> <div ui-view cg-busy="application.stateLoading('orderDetail')"> diff --git a/src/app/myOrders/shipments/js/orderShipments.config.js b/src/app/myOrders/shipments/js/orderShipments.config.js new file mode 100644 index 00000000..69d248e7 --- /dev/null +++ b/src/app/myOrders/shipments/js/orderShipments.config.js @@ -0,0 +1,21 @@ +angular.module('orderCloud') + .config(OrderShipmentsConfig) +; + +function OrderShipmentsConfig($stateProvider) { + $stateProvider + .state('orderDetail.shipments', { + url: '/shipments', + templateUrl: 'myOrders/shipments/templates/orderShipments.html', + controller: 'OrderShipmentsCtrl', + controllerAs: 'orderShipments', + data: { + pageTitle: 'Order Shipments' + }, + resolve: { + OrderShipments: function($stateParams, ocOrderShipments) { + return ocOrderShipments.List($stateParams.orderid); + } + } + }) +} \ No newline at end of file diff --git a/src/app/myOrders/shipments/js/orderShipments.controller.js b/src/app/myOrders/shipments/js/orderShipments.controller.js new file mode 100644 index 00000000..57d23b72 --- /dev/null +++ b/src/app/myOrders/shipments/js/orderShipments.controller.js @@ -0,0 +1,30 @@ +angular.module('orderCloud') + .controller('OrderShipmentsCtrl', OrderShipmentsController) +; + +function OrderShipmentsController($stateParams, OrderShipments) { + var vm = this; + vm.list = OrderShipments; + vm.orderID = $stateParams.orderid; + + vm.pageChanged = function() { + ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list = data; + }); + }; + + vm.loadMore = function() { + vm.list.Meta.Page++; + ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + }; + + vm.selectShipment = function(shipment) { + vm.selectedShipment = angular.copy(shipment); + }; + if (vm.list.Items.length) vm.selectShipment(vm.list.Items[0]); +} \ No newline at end of file diff --git a/src/app/myOrders/shipments/js/orderShipments.service.js b/src/app/myOrders/shipments/js/orderShipments.service.js new file mode 100644 index 00000000..d6b8b5d7 --- /dev/null +++ b/src/app/myOrders/shipments/js/orderShipments.service.js @@ -0,0 +1,79 @@ +angular.module('orderCloud') + .factory('ocOrderShipments', OrderCloudOrderShipmentsService) +; + +function OrderCloudOrderShipmentsService($q, sdkOrderCloud) { + var service = { + List: _list + }; + + function _list(orderID, page, pageSize) { + var df = $q.defer(); + + var options = { + orderID: orderID, + page: page, + pageSize: pageSize + }; + sdkOrderCloud.Me.ListShipments(options) + .then(function(data) { + df.resolve(data); + //TODO: Add this back if Shopper is able to list shipment items + //getShipmentItems(data); + }); + + function getShipmentItems(data) { + var queue = []; + + angular.forEach(data.Items, function(shipment) { + queue.push((function() { + var d = $q.defer(); + + sdkOrderCloud.Shipments.ListItems(shipment.ID) + .then(function(shipmentItems) { + shipment.Items = shipmentItems.Items; + d.resolve(); + }); + + return d.promise; + })()); + }); + + $q.all(queue).then(function() { + getLineItems(data); + }); + } + + function getLineItems(data) { + var lineItemIDs = _.uniq(_.flatten(_.map(data.Items, function(shipment) { return _.pluck(shipment.Items, 'LineItemID');}))); + var options = { + page: 1, + pageSize: 100, + filters: {ID: lineItemIDs.join('|')} + }; + sdkOrderCloud.LineItems.List('incoming', orderID, options) + .then(function(lineItemData) { + angular.forEach(data.Items, function(shipment) { + angular.forEach(shipment.Items, function(shipmentItem) { + shipmentItem.LineItem = _.findWhere(lineItemData.Items, {ID: shipmentItem.LineItemID}); + }); + }); + + analyzeShippingAddresses(data); + }); + } + + function analyzeShippingAddresses(data) { + angular.forEach(data.Items, function(shipment) { + var shippingAddressCount = _.uniq(_.map(shipment.Items, function(item) { return (item.LineItem.ShippingAddress ? (item.LineItem.ShippingAddress.ID ? item.LineItem.ShippingAddress.ID : item.LineItem.ShippingAddress.Street1) : item.LineItem.ShippingAddressID); })).length; + shipment.ShippingAddress = (shippingAddressCount == 1) ? shipment.Items[0].LineItem.ShippingAddress : null; + }); + + df.resolve(data); + } + + return df.promise; + } + + return service; +} \ No newline at end of file diff --git a/src/app/myOrders/shipments/templates/orderShipments.html b/src/app/myOrders/shipments/templates/orderShipments.html new file mode 100644 index 00000000..c166f4d6 --- /dev/null +++ b/src/app/myOrders/shipments/templates/orderShipments.html @@ -0,0 +1,92 @@ +<div cg-busy="application.stateLoading('shipments')"> + <div ng-if="!orderShipments.list.Items.length" class="no-matches"> + This order does not have any shipments. <br> + </div> + <div class="row" ng-if="orderShipments.list.Items.length"> + <div class="col-sm-5"> + <br> + <ul class="list-group"> + <li class="list-group-item" ng-class="{'active': shipment.ID == orderShipments.selectedShipment.ID}" ng-repeat="shipment in orderShipments.list.Items" ng-click="orderShipments.selectShipment(shipment)"> + <b>{{shipment.ID}}</b> + </li> + </ul> + <!--====== SHIPMENT PAGINATION ======--> + <ul uib-pagination + class="pagination-sm pull-right hidden-xs" + ng-if="orderShipments.list.Meta.TotalPages > 1" + total-items="orderShipments.list.Meta.TotalCount" + items-per-page="orderShipments.list.Meta.PageSize" + max-size="5" + boundary-links="orderShipments.list.Meta.TotalPages > 5" + ng-model="orderShipments.list.Meta.Page" + ng-change="orderShipments.pageChanged()"> + </ul> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="orderShipments.list.Meta.Page < orderShipments.list.Meta.TotalPages" + ng-click="orderShipments.loadMore()">Load More</button> + </div> + <div class="col-sm-7"> + <div ng-if="!orderShipments.selectedShipment" class="well text-center"> + Select a shipment to view details + </div> + <div ng-if="orderShipments.selectedShipment"> + <header> + <h3> + {{orderShipments.selectedShipment.ID}} + </h3> + </header> + <br> + <div class="panel panel-default"> + <div class="panel-body"> + <b>Shipper: </b> {{orderShipments.selectedShipment.Shipper}} <br> + <b>Tracking Number: </b> {{orderShipments.selectedShipment.TrackingNumber}} <br> + <b>Date Shipped: </b> {{orderShipments.selectedShipment.DateShipped | date:'shortDate'}} <br> + <b>Date Delivered: </b> {{orderShipments.selectedShipment.DateDelivered | date:'shortDate'}} <br> + <b>Cost: </b> {{orderShipments.selectedShipment.Cost | currency}} + </div> + </div> + <div class="panel panel-default" ng-if="orderShipments.selectedShipment.ShippingAddress"> + <div class="panel-body"> + <h4>Shipping Address</h4> + <div ng-bind-html="orderShipments.selectedShipment.ShippingAddress | address:'full'"></div> + </div> + </div> + <div ng-if="orderShipments.selectedShipment.Items.length"> + <div class="panel panel-default table-responsive"> + <table class="table table-bordered l-shipmentitem-table"> + <colgroup> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th><span class="hidden-xs">Quantity </span>Shipped</th> + <th>Product</th> + <th>Line Item ID</th> + </tr> + </thead> + <tbody> + <tr ng-repeat-start="item in orderShipments.selectedShipment.Items" ng-if="item.OrderID == orderShipments.orderID"> + <td ng-click="orderShipments.editShipmentItem(item)">{{item.QuantityShipped + ' of ' + item.LineItem.Quantity}}</td> + <td rowspan="{{orderShipments.selectedShipment.ShippingAddress ? 1 : 2}}"> + {{item.LineItem.Product.Name}} <small class="text-muted">({{item.LineItem.Product.ID}})</small> + </td> + <td>{{item.LineItem.ID}}</td> + </tr> + <tr ng-repeat-end ng-if="!orderShipments.selectedShipment.ShippingAddress"> + <td colspan="2">{{item.LineItem.ShippingAddress | address:'fullOneLine'}}</td> + </tr> + </tbody> + </table> + </div> + </div> + <!-- TODO: Add this back if Shopper is able to list shipment items --> + <!--<div ng-if="!orderShipments.selectedShipment.Items.length" class="no-matches"> + This shipment does not have any items. <br> + </div>--> + </div> + </div> + </div> +</div> \ No newline at end of file From 49c6b23a66a8acf886ae8f455d83be2a1336e17d Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 7 Apr 2017 15:08:22 -0500 Subject: [PATCH 095/158] OC-2047 Order History detail: payments tab --- .../order/templates/orderDetails.html | 5 +- .../payments/js/orderPayments.config.js | 22 +++++ .../payments/js/orderPayments.controller.js | 24 ++++++ .../payments/js/orderPayments.service.js | 73 +++++++++++++++++ .../payments/templates/orderPayments.html | 82 +++++++++++++++++++ 5 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 src/app/myOrders/payments/js/orderPayments.config.js create mode 100644 src/app/myOrders/payments/js/orderPayments.controller.js create mode 100644 src/app/myOrders/payments/js/orderPayments.service.js create mode 100644 src/app/myOrders/payments/templates/orderPayments.html diff --git a/src/app/myOrders/order/templates/orderDetails.html b/src/app/myOrders/order/templates/orderDetails.html index b05491bd..a50b1f75 100644 --- a/src/app/myOrders/order/templates/orderDetails.html +++ b/src/app/myOrders/order/templates/orderDetails.html @@ -14,10 +14,9 @@ <h3 class="l-page-header__title"> <li ng-class="{active: application.$state.is('orderDetail')}"> <a href="" ui-sref="orderDetail"><i class="fa fa-cube"></i> <span>Details</span></a> </li> - <!--TODO: bring these back in as they become available--> - <!--<li ui-sref-active="active"> + <li ui-sref-active="active"> <a href="" ui-sref=".payments"><i class="fa fa-dollar"></i> Payments</a> - </li>--> + </li> <li ui-sref-active="active"> <a href="" ui-sref=".shipments"><i class="fa fa-truck"></i> Shipments</a> </li> diff --git a/src/app/myOrders/payments/js/orderPayments.config.js b/src/app/myOrders/payments/js/orderPayments.config.js new file mode 100644 index 00000000..a80f68b1 --- /dev/null +++ b/src/app/myOrders/payments/js/orderPayments.config.js @@ -0,0 +1,22 @@ +angular.module('orderCloud') + .config(OrderPaymentsConfig) +; + +function OrderPaymentsConfig($stateProvider) { + $stateProvider + .state('orderDetail.payments', { + url: '/payments', + templateUrl: 'myOrders/payments/templates/orderPayments.html', + controller: 'OrderPaymentsCtrl', + controllerAs: 'orderPayments', + data: { + pageTitle: 'Order Payments' + }, + resolve: { + OrderPayments: function($stateParams, ocOrderPayments, buyerid) { + return ocOrderPayments.List($stateParams.orderid, buyerid, 1, null); + } + } + }) + ; +} \ No newline at end of file diff --git a/src/app/myOrders/payments/js/orderPayments.controller.js b/src/app/myOrders/payments/js/orderPayments.controller.js new file mode 100644 index 00000000..e34472db --- /dev/null +++ b/src/app/myOrders/payments/js/orderPayments.controller.js @@ -0,0 +1,24 @@ +angular.module('orderCloud') + .controller('OrderPaymentsCtrl', OrderPaymentsController) +; + +function OrderPaymentsController($stateParams, ocOrderPayments, OrderPayments, buyerid) { + var vm = this; + vm.list = OrderPayments; + + vm.pageChanged = function() { + ocOrderPayments.List($stateParams.orderid, buyerid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list = data; + }); + }; + + vm.loadMore = function() { + vm.list.Meta.Page++; + ocOrderPayments.List($stateParams.orderid, buyerid, vm.list.Meta.Page, vm.list.Meta.PageSize) + .then(function(data) { + vm.list.Items = vm.list.Items.concat(data.Items); + vm.list.Meta = data.Meta; + }); + }; +} \ No newline at end of file diff --git a/src/app/myOrders/payments/js/orderPayments.service.js b/src/app/myOrders/payments/js/orderPayments.service.js new file mode 100644 index 00000000..b355904c --- /dev/null +++ b/src/app/myOrders/payments/js/orderPayments.service.js @@ -0,0 +1,73 @@ +angular.module('orderCloud') + .factory('ocOrderPayments', OrderCloudOrderPaymentsService) +; + +function OrderCloudOrderPaymentsService($q, sdkOrderCloud) { + var service = { + List: _list + }; + + function _list(orderID, buyerID, page, pageSize) { + var deferred = $q.defer(); + + var options = { + page: page, + pageSize: pageSize + }; + sdkOrderCloud.Payments.List('outgoing', orderID, options) + .then(function(data) { + getPaymentDetails(data); + }); + + function getPaymentDetails(data) { + var queue = []; + angular.forEach(data.Items, function(payment) { + queue.push((function() { + var d = $q.defer(); + + payment.Details = null; + + if (payment.Type == 'SpendingAccount') { + sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + .then(function(spendingAccount) { + payment.Details = spendingAccount; + d.resolve(); + }) + .catch(function() { + d.resolve(); + }); + } + else if (payment.Type == 'CreditCard') { + sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) + .then(function(creditCard) { + payment.Details = creditCard; + d.resolve(); + }) + .catch(function() { + d.resolve(); + }); + } + else if (payment.Type == 'PurchaseOrder') { + if (payment.xp && payment.xp.PONumber) { + payment.Details = { + PONumber: payment.xp.PONumber + }; + } + d.resolve(); + } + else { + d.resolve(); + } + + return d.promise; + })()); + }); + + deferred.resolve(data); + } + + return deferred.promise; + } + + return service; +} \ No newline at end of file diff --git a/src/app/myOrders/payments/templates/orderPayments.html b/src/app/myOrders/payments/templates/orderPayments.html new file mode 100644 index 00000000..66350b2b --- /dev/null +++ b/src/app/myOrders/payments/templates/orderPayments.html @@ -0,0 +1,82 @@ +<div cg-busy="application.stateLoading('payments')"> + <!--====== PAYMENT LIST ======--> + <div class="panel panel-default table-responsive" ng-if="orderPayments.list.Items.length"> + <table class="table table-striped table-bordered l-payment-table"> + <colgroup> + <col> + <col> + <col> + <col> + <col> + </colgroup> + <thead> + <tr> + <th>ID</th> + <th>Type</th> + <th>Details</th> + <th>Date Created</th> + <th>Amount</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="payment in orderPayments.list.Items"> + <td>{{payment.ID}}</td> + <td>{{payment.Type | humanize}} </td> + <td> + <div ng-if="!payment.Details">No details available</div> + <div ng-if="payment.Details"> + <div ng-if="payment.Type == 'CreditCard'"> + <b>{{payment.Details.CardholderName}}</b> + <div> + <span><i class="fa fa-lg {{payment.Details.CardType | faCreditCard}}"></i></span> + <small>{{'XXXX-XXXX-XXXX-' + payment.Details.PartialAccountNumber}}</small><br> + <small class="text-muted">Expires On: {{payment.Details.ExpirationDate | date:'MM/yy'}}</small><br> + <small class="text-muted">({{payment.CreditCardID}})</small> + </div> + </div> + <div ng-if="payment.Type == 'SpendingAccount'"> + <b>{{payment.Details.Name}}</b> + <div class="text-muted"> + <small>({{payment.SpendingAccountID}})</small><br> + <small ng-if="payment.Details.StartDate && payment.Details.EndDate"> + Lifetime: {{payment.Details.StartDate | date:'shortDate'}} - {{payment.Details.EndDate | date :'shortDate'}} + </small> + <small ng-if="payment.Details.StartDate && !payment.Details.EndDate"> + Made Available On: {{payment.Details.StartDate | date:'shortDate'}} + </small> + <small ng-if="!payment.Details.StartDate && payment.Details.EndDate"> + Expires On: {{payment.Details.EndDate | date :'shortDate'}} + </small> + </div> + </div> + <div ng-if="payment.Type == 'PurchaseOrder'"> + <b>PO Number:</b> {{payment.Details.PONumber}} + </div> + </div> + </td> + <td>{{payment.DateCreated | date:'short'}}</td> + <td>{{payment.Amount | currency}}</td> + </tr> + </tbody> + </table> + </div> + <div ng-if="!orderPayments.list.Items.length" class="no-matches"> + This order does not have any payments. <br> + </div> + + <!--====== PAYMENTS PAGINATION ======--> + <ul uib-pagination + class="pagination-sm pull-right hidden-xs" + ng-if="orderPayments.list.Meta.TotalPages > 1" + total-items="orderPayments.list.Meta.TotalCount" + items-per-page="orderPayments.list.Meta.PageSize" + max-size="5" + boundary-links="orderPayments.list.Meta.TotalPages > 5" + ng-model="orderPayments.list.Meta.Page" + ng-change="orderPayments.pageChanged()"> + </ul> + <button type="button" + class="btn btn-default btn-block btn-lg visible-xs" + ng-show="orderPayments.list.Meta.Page < orderPayments.list.Meta.TotalPages" + ng-click="orderPayments.loadMore()">Load More</button> +</div> \ No newline at end of file From c4fa0d3833f5f60e90ada4f327755b192583ea91 Mon Sep 17 00:00:00 2001 From: Robert Watt <rwatt@four51.com> Date: Mon, 10 Apr 2017 13:04:29 -0500 Subject: [PATCH 096/158] Find and replace sdkOrderCloud with OrderCloudSDK Remove old SDK Install angular wrapper package --- bower.json | 4 +- src/app/account/js/account.controller.js | 6 +- .../js/changePassword.modal.controller.js | 6 +- .../js/confirmPassword.modal.controller.js | 4 +- .../js/addPromotion.controller.js | 4 +- src/app/app.module.js | 6 +- src/app/base/js/base.config.js | 15 ++-- src/app/base/js/base.controller.js | 4 +- src/app/base/js/newOrder.service.js | 8 +- src/app/cart/js/cart.config.js | 8 +- src/app/cart/js/cart.controller.js | 10 +-- .../js/categoryBrowse.config.js | 12 +-- .../js/categoryBrowse.controller.js | 6 +- .../confirmation/js/confirmation.config.js | 30 +++---- src/app/checkout/js/checkout.config.js | 12 +-- src/app/checkout/js/checkout.controller.js | 12 +-- .../js/checkoutAddressSelect.service.js | 6 +- .../directives/js/creditCard.controller.js | 8 +- .../directives/js/payment.controller.js | 8 +- .../directives/js/payments.controller.js | 8 +- .../directives/js/purchaseOrder.controller.js | 10 +-- .../js/spendingAccount.controller.js | 8 +- .../checkout/payment/js/payment.controller.js | 4 +- .../checkout/payment/js/payment.service.js | 14 ++-- src/app/checkout/review/js/review.config.js | 12 +-- .../shipping/js/shipping.controller.js | 4 +- .../shipping/js/shippingRates.service.js | 10 +-- .../ordercloud-angular-sdk.js | 9 +++ .../oc-quantity-input/oc-quantity-input.js | 4 +- .../common/services/oc-authnet/oc-authnet.js | 4 +- .../services/oc-lineitems/oc-lineitems.js | 16 ++-- src/app/common/services/oc-roles/oc-roles.js | 16 ++-- .../common/services/oc-wrapper/oc-wrapper.js | 79 ------------------- .../js/favoriteOrders.component.js | 6 +- .../js/favoriteProduct.controller.js | 8 +- .../js/favoriteProducts.config.js | 6 +- .../js/favoriteProducts.controller.js | 4 +- src/app/login/js/login.controller.js | 15 ++-- src/app/login/js/login.service.js | 19 ++--- src/app/myAddresses/js/myAddresses.config.js | 6 +- .../myAddresses/js/myAddresses.controller.js | 4 +- .../js/myAddressesCreate.modal.controller.js | 4 +- .../js/myAddressesEdit.modal.controller.js | 4 +- .../myOrders/approvals/js/approvals.config.js | 4 +- .../approvals/js/approvals.controller.js | 6 +- .../approvals/js/approvals.service.js | 12 +-- .../myOrders/order/js/orderDetails.config.js | 4 +- .../order/js/orderDetails.controller.js | 15 +++- .../myOrders/order/js/orderDetails.service.js | 6 +- .../myOrders/orders/js/orders.controller.js | 2 +- src/app/myOrders/orders/js/orders.service.js | 6 +- .../shipments/js/orderShipments.service.js | 8 +- src/app/myPayments/js/myPayments.config.js | 14 ++-- .../productBrowse/js/productBrowse.config.js | 8 +- .../js/productBrowseProductView.controller.js | 4 +- .../productDetail/js/productDetail.config.js | 4 +- .../productDetail/js/specForm.directive.js | 6 +- .../js/productSearch.component.js | 4 +- .../productSearch/js/productSearch.config.js | 4 +- .../js/productSearch.controller.js | 6 +- .../js/productSearch.modal.controller.js | 4 +- src/app/repeatOrder/js/repeatOrder.service.js | 8 +- 62 files changed, 251 insertions(+), 317 deletions(-) create mode 100644 src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js delete mode 100644 src/app/common/services/oc-wrapper/oc-wrapper.js diff --git a/bower.json b/bower.json index d3c56f87..15f9bb0c 100644 --- a/bower.json +++ b/bower.json @@ -25,6 +25,7 @@ "dependencies": { "bootstrap": "^3.3.6", "angular": "^1.6.0", + "angular-cookies": "^1.6.0", "angular-resource": "^1.6.0", "angular-animate": "^1.6.0", "angular-sanitize": "^1.6.0", @@ -33,7 +34,6 @@ "angular-toastr": "^1.7.0", "angular-ui-tree": "^2.16.0", "angular-bootstrap": "^1.3.3", - "ordercloud-ng-sdk": "1.0.27", "angular-auto-validate": "^1.19.5", "font-awesome": "^4.6.3", "angular-localforage": "^1.2.5", @@ -45,7 +45,7 @@ "jasny-bootstrap": "3.1.3", "angular-payments": "*", "bootswatch": "^3.3.7", - "ordercloud-javascript-sdk": "v1.0.43-staging-prerelease" + "ordercloud-angular-sdk": "v1.0.45-staging-prerelease" }, "devDependencies": { "angular-mocks": "^1.6.0" diff --git a/src/app/account/js/account.controller.js b/src/app/account/js/account.controller.js index 21796020..a70b85a5 100644 --- a/src/app/account/js/account.controller.js +++ b/src/app/account/js/account.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('AccountCtrl', AccountController) ; -function AccountController($exceptionHandler, $uibModal, toastr, sdkOrderCloud, ocAccount, CurrentUser){ +function AccountController($exceptionHandler, $uibModal, toastr, OrderCloudSDK, ocAccount, CurrentUser){ var vm = this; vm.profile = angular.copy(CurrentUser); vm.currentUser = CurrentUser; @@ -14,7 +14,7 @@ function AccountController($exceptionHandler, $uibModal, toastr, sdkOrderCloud, vm.updateProfile = function () { ocAccount.ConfirmPassword(vm.currentUser) .then(function () { - vm.profileUpdateLoading = sdkOrderCloud.Me.Patch(_.pick(vm.profile, ['FirstName', 'LastName', 'Email', 'Phone'])) + vm.profileUpdateLoading = OrderCloudSDK.Me.Patch(_.pick(vm.profile, ['FirstName', 'LastName', 'Email', 'Phone'])) .then(function (updatedUser) { vm.profile = angular.copy(updatedUser); vm.currentUser = updatedUser; @@ -27,7 +27,7 @@ function AccountController($exceptionHandler, $uibModal, toastr, sdkOrderCloud, vm.updateUsername = function () { ocAccount.ConfirmPassword(vm.currentUser) .then(function () { - vm.profileUpdateLoading = sdkOrderCloud.Me.Patch(_.pick(vm.profile, 'Username')) + vm.profileUpdateLoading = OrderCloudSDK.Me.Patch(_.pick(vm.profile, 'Username')) .then(function (updatedUser) { vm.profile = angular.copy(updatedUser); vm.currentUser = updatedUser; diff --git a/src/app/account/js/changePassword.modal.controller.js b/src/app/account/js/changePassword.modal.controller.js index 60927232..9f20c23a 100644 --- a/src/app/account/js/changePassword.modal.controller.js +++ b/src/app/account/js/changePassword.modal.controller.js @@ -1,7 +1,7 @@ angular.module('orderCloud') .controller('ChangePasswordModalCtrl', ChangePasswordModalController); -function ChangePasswordModalController($exceptionHandler, sdkOrderCloud, $uibModalInstance, CurrentUser, clientid, scope) { +function ChangePasswordModalController($exceptionHandler, OrderCloudSDK, $uibModalInstance, CurrentUser, clientid, scope) { var vm = this; vm.currentUser = CurrentUser; @@ -11,9 +11,9 @@ function ChangePasswordModalController($exceptionHandler, sdkOrderCloud, $uibMod Password: vm.currentUser.CurrentPassword }; - return vm.loading = sdkOrderCloud.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) + return vm.loading = OrderCloudSDK.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) .then(function () { - return sdkOrderCloud.Me.ResetPasswordByToken({ + return OrderCloudSDK.Me.ResetPasswordByToken({ NewPassword: vm.currentUser.NewPassword }) .then(function () { diff --git a/src/app/account/js/confirmPassword.modal.controller.js b/src/app/account/js/confirmPassword.modal.controller.js index 113978ae..77e7d6e7 100644 --- a/src/app/account/js/confirmPassword.modal.controller.js +++ b/src/app/account/js/confirmPassword.modal.controller.js @@ -1,7 +1,7 @@ angular.module('orderCloud') .controller('ConfirmPasswordModalCtrl', ConfirmPasswordModalController); -function ConfirmPasswordModalController($exceptionHandler, $uibModalInstance, CurrentUser, $cookies, sdkOrderCloud, appname, clientid, scope) { +function ConfirmPasswordModalController($exceptionHandler, $uibModalInstance, CurrentUser, $cookies, OrderCloudSDK, appname, clientid, scope) { var vm = this; vm.submit = function () { @@ -10,7 +10,7 @@ function ConfirmPasswordModalController($exceptionHandler, $uibModalInstance, Cu Password: vm.password }; - sdkOrderCloud.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) + OrderCloudSDK.Auth.Login(checkPasswordCredentials.Username, checkPasswordCredentials.Password, clientid, scope) .then(function () { var expiresIn = new Date(); expiresIn.setMinutes(expiresIn.getMinutes() + 20); diff --git a/src/app/addPromotion/js/addPromotion.controller.js b/src/app/addPromotion/js/addPromotion.controller.js index 18f5e3fd..f443c88d 100644 --- a/src/app/addPromotion/js/addPromotion.controller.js +++ b/src/app/addPromotion/js/addPromotion.controller.js @@ -2,9 +2,9 @@ angular.module('orderCloud') .controller('AddPromotionComponentCtrl', AddPromotionComponentController) ; -function AddPromotionComponentController($exceptionHandler, $rootScope, sdkOrderCloud, toastr) { +function AddPromotionComponentController($exceptionHandler, $rootScope, OrderCloudSDK, toastr) { this.submit = function(orderID, promoCode) { - sdkOrderCloud.Orders.AddPromotion('outgoing', orderID, promoCode) + OrderCloudSDK.Orders.AddPromotion('outgoing', orderID, promoCode) .then(function(promo) { $rootScope.$broadcast('OC:UpdatePromotions', orderID); $rootScope.$broadcast('OC:UpdateOrder', orderID); diff --git a/src/app/app.module.js b/src/app/app.module.js index 15ff7ed2..adde5776 100644 --- a/src/app/app.module.js +++ b/src/app/app.module.js @@ -1,18 +1,20 @@ angular.module('orderCloud', [ + 'ngCookies', 'ngSanitize', 'ngAnimate', 'ngMessages', + 'ngResource', 'ngTouch', 'ui.tree', 'ui.router', 'ui.bootstrap', - 'orderCloud.sdk', 'LocalForageModule', 'toastr', 'angular-busy', 'jcs-autoValidate', 'treeControl', 'hl.sticky', - 'angularPayments' + 'angularPayments', + 'ordercloud-angular-sdk' ] ); \ No newline at end of file diff --git a/src/app/base/js/base.config.js b/src/app/base/js/base.config.js index f3ec8774..857f2efd 100644 --- a/src/app/base/js/base.config.js +++ b/src/app/base/js/base.config.js @@ -17,24 +17,23 @@ function BaseConfig($stateProvider) { } }, resolve: { - CurrentUser: function($q, $state, OrderCloud, sdkOrderCloud, buyerid) { - return sdkOrderCloud.Me.Get() + CurrentUser: function($q, $state, OrderCloudSDK) { + return OrderCloudSDK.Me.Get() .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); //TODO: remove this line after refactor is complete return data; }) .catch(function(ex) { $state.go('login'); - }) + }); }, - ExistingOrder: function($q, sdkOrderCloud, CurrentUser) { + ExistingOrder: function($q, OrderCloudSDK, CurrentUser) { var options = { page: 1, pageSize: 1, sortBy: '!DateCreated', filters: {Status: 'Unsubmitted'} }; - return sdkOrderCloud.Me.ListOrders(options) + return OrderCloudSDK.Me.ListOrders(options) .then(function(data) { return data.Items[0]; }); @@ -46,8 +45,8 @@ function BaseConfig($stateProvider) { return ExistingOrder; } }, - AnonymousUser: function($q, sdkOrderCloud, CurrentUser) { - CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(sdkOrderCloud.GetToken().split('.')[1])).orderid); + AnonymousUser: function($q, OrderCloudSDK, CurrentUser) { + CurrentUser.Anonymous = angular.isDefined(JSON.parse(atob(OrderCloudSDK.GetToken().split('.')[1])).orderid); } } }); diff --git a/src/app/base/js/base.controller.js b/src/app/base/js/base.controller.js index 9457ed06..62a8d4f9 100644 --- a/src/app/base/js/base.controller.js +++ b/src/app/base/js/base.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('BaseCtrl', BaseController) ; -function BaseController($rootScope, $state, sdkOrderCloud, ocProductSearch, CurrentUser, CurrentOrder) { +function BaseController($rootScope, $state, OrderCloudSDK, ocProductSearch, CurrentUser, CurrentOrder) { var vm = this; vm.currentUser = CurrentUser; vm.currentOrder = CurrentOrder; @@ -22,7 +22,7 @@ function BaseController($rootScope, $state, sdkOrderCloud, ocProductSearch, Curr vm.orderLoading = { message: message }; - vm.orderLoading.promise = sdkOrderCloud.Orders.Get('outgoing', OrderID) + vm.orderLoading.promise = OrderCloudSDK.Orders.Get('outgoing', OrderID) .then(function(data) { vm.currentOrder = data; }); diff --git a/src/app/base/js/newOrder.service.js b/src/app/base/js/newOrder.service.js index 7051e791..f8da4ea6 100644 --- a/src/app/base/js/newOrder.service.js +++ b/src/app/base/js/newOrder.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocNewOrder', OrderCloudNewOrderService) ; -function OrderCloudNewOrderService($q, sdkOrderCloud) { +function OrderCloudNewOrderService($q, OrderCloudSDK) { var service = { Create: _create }; @@ -17,7 +17,7 @@ function OrderCloudNewOrderService($q, sdkOrderCloud) { pageSize: 100, filters: {Shipping: true} }; - sdkOrderCloud.Me.ListAddresses(options) + OrderCloudSDK.Me.ListAddresses(options) .then(function(shippingAddresses) { if (shippingAddresses.Items.length) order.ShippingAddressID = shippingAddresses.Items[0].ID; setBillingAddress(); @@ -30,7 +30,7 @@ function OrderCloudNewOrderService($q, sdkOrderCloud) { pageSize: 100, filters: {Billing: true} }; - sdkOrderCloud.Me.ListAddresses(options) + OrderCloudSDK.Me.ListAddresses(options) .then(function(billingAddresses) { if (billingAddresses.Items.length) order.BillingAddressID = billingAddresses.Items[0].ID; createOrder(); @@ -38,7 +38,7 @@ function OrderCloudNewOrderService($q, sdkOrderCloud) { } function createOrder() { - sdkOrderCloud.Orders.Create('outgoing', order) + OrderCloudSDK.Orders.Create('outgoing', order) .then(function(order) { deferred.resolve(order); }); diff --git a/src/app/cart/js/cart.config.js b/src/app/cart/js/cart.config.js index d8974b90..3b966071 100644 --- a/src/app/cart/js/cart.config.js +++ b/src/app/cart/js/cart.config.js @@ -14,9 +14,9 @@ function CartConfig($stateProvider) { pageTitle: 'Shopping Cart' }, resolve: { - LineItemsList: function($q, $state, toastr, sdkOrderCloud, ocLineItems, CurrentOrder) { + LineItemsList: function($q, $state, toastr, OrderCloudSDK, ocLineItems, CurrentOrder) { var dfd = $q.defer(); - sdkOrderCloud.LineItems.List('outgoing', CurrentOrder.ID) + OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID) .then(function(data) { if (!data.Items.length) { dfd.resolve(data); @@ -34,8 +34,8 @@ function CartConfig($stateProvider) { }); return dfd.promise; }, - CurrentPromotions: function(CurrentOrder, sdkOrderCloud) { - return sdkOrderCloud.Orders.ListPromotions('outgoing', CurrentOrder.ID); + CurrentPromotions: function(CurrentOrder, OrderCloudSDK) { + return OrderCloudSDK.Orders.ListPromotions('outgoing', CurrentOrder.ID); } } }); diff --git a/src/app/cart/js/cart.controller.js b/src/app/cart/js/cart.controller.js index 49367ff0..b72f7b75 100644 --- a/src/app/cart/js/cart.controller.js +++ b/src/app/cart/js/cart.controller.js @@ -2,13 +2,13 @@ angular.module('orderCloud') .controller('CartCtrl', CartController) ; -function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList, CurrentPromotions, ocConfirm) { +function CartController($rootScope, $state, toastr, OrderCloudSDK, LineItemsList, CurrentPromotions, ocConfirm) { var vm = this; vm.lineItems = LineItemsList; vm.promotions = CurrentPromotions.Meta ? CurrentPromotions.Items : CurrentPromotions; vm.removeItem = function(order, scope) { vm.lineLoading = []; - vm.lineLoading[scope.$index] = sdkOrderCloud.LineItems.Delete('outgoing', order.ID, scope.lineItem.ID) + vm.lineLoading[scope.$index] = OrderCloudSDK.LineItems.Delete('outgoing', order.ID, scope.lineItem.ID) .then(function () { $rootScope.$broadcast('OC:UpdateOrder', order.ID); vm.lineItems.Items.splice(scope.$index, 1); @@ -18,7 +18,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList //TODO: missing unit tests vm.removePromotion = function(order, scope) { - sdkOrderCloud.Orders.RemovePromotion('outgoing', order.ID, scope.promotion.Code) + OrderCloudSDK.Orders.RemovePromotion('outgoing', order.ID, scope.promotion.Code) .then(function() { $rootScope.$broadcast('OC:UpdateOrder', order.ID); vm.promotions.splice(scope.$index, 1); @@ -31,7 +31,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList confirmText: 'Yes, cancel order', type: 'delete'}) .then(function() { - sdkOrderCloud.Orders.Delete('outgoing', order.ID) + OrderCloudSDK.Orders.Delete('outgoing', order.ID) .then(function(){ $state.go('home', {}, {reload:'base'}); }); @@ -40,7 +40,7 @@ function CartController($rootScope, $state, toastr, sdkOrderCloud, LineItemsList //TODO: missing unit tests $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { - sdkOrderCloud.Orders.ListPromotions('outgoing', orderid) + OrderCloudSDK.Orders.ListPromotions('outgoing', orderid) .then(function(data) { if (data.Meta) { vm.promotions = data.Items; diff --git a/src/app/categoryBrowse/js/categoryBrowse.config.js b/src/app/categoryBrowse/js/categoryBrowse.config.js index 7fec6453..f0954945 100644 --- a/src/app/categoryBrowse/js/categoryBrowse.config.js +++ b/src/app/categoryBrowse/js/categoryBrowse.config.js @@ -14,21 +14,21 @@ function CategoryBrowseConfig($stateProvider, catalogid){ Parameters: function($stateParams, ocParameters) { return ocParameters.Get($stateParams); }, - CategoryList: function(sdkOrderCloud, Parameters, catalogid) { + CategoryList: function(OrderCloudSDK, Parameters, catalogid) { if(Parameters.categoryID) { Parameters.filters ? Parameters.filters.ParentID = Parameters.categoryID : Parameters.filters = {ParentID:Parameters.categoryID}; } var parameters = angular.extend(Parameters, {depth: 1, page: (Parameters.categoryPage || Parameters.page), pageSize: (Parameters.pageSize || 12), catalogID: catalogid}); - return sdkOrderCloud.Me.ListCategories(parameters); + return OrderCloudSDK.Me.ListCategories(parameters); }, - ProductList: function(sdkOrderCloud, Parameters, catalogid) { + ProductList: function(OrderCloudSDK, Parameters, catalogid) { if(Parameters && Parameters.filters && Parameters.filters.ParentID) { delete Parameters.filters.ParentID; var parameters = angular.extend(Parameters, {depth: 'all', catalogID: catalogid, page: (Parameters.productPage || Parameters.page), pageSize: (Parameters.pageSize || 12)}); - return sdkOrderCloud.Me.ListProducts(parameters); + return OrderCloudSDK.Me.ListProducts(parameters); } else { return null; } }, - SelectedCategory: function(sdkOrderCloud, Parameters){ + SelectedCategory: function(OrderCloudSDK, Parameters){ if(Parameters.categoryID){ var parameters = { page: 1, @@ -36,7 +36,7 @@ function CategoryBrowseConfig($stateProvider, catalogid){ depth: 'all', filters: {ID: Parameters.categoryID} }; - return sdkOrderCloud.Me.ListCategories(parameters) + return OrderCloudSDK.Me.ListCategories(parameters) .then(function(data){ return data.Items[0]; }); diff --git a/src/app/categoryBrowse/js/categoryBrowse.controller.js b/src/app/categoryBrowse/js/categoryBrowse.controller.js index a7f54625..117c938f 100644 --- a/src/app/categoryBrowse/js/categoryBrowse.controller.js +++ b/src/app/categoryBrowse/js/categoryBrowse.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CategoryBrowseCtrl', CategoryBrowseController) ; -function CategoryBrowseController($state, sdkOrderCloud, ocParameters, CategoryList, ProductList, Parameters, SelectedCategory) { +function CategoryBrowseController($state, OrderCloudSDK, ocParameters, CategoryList, ProductList, Parameters, SelectedCategory) { var vm = this; vm.categoryList = CategoryList; vm.productList = ProductList; @@ -29,7 +29,7 @@ function CategoryBrowseController($state, sdkOrderCloud, ocParameters, CategoryL vm.loadMoreCategories = function() { var parameters = angular.extend(Parameters, {page:vm.categoryList.Meta.Page + 1}); - return sdkOrderCloud.Me.ListCategories(parameters) + return OrderCloudSDK.Me.ListCategories(parameters) .then(function(data) { vm.categoryList.Items = vm.categoryList.Items.concat(data.Items); vm.categoryList.Meta = data.Meta; @@ -43,7 +43,7 @@ function CategoryBrowseController($state, sdkOrderCloud, ocParameters, CategoryL vm.loadMoreProducts = function() { var parameters = angular.extend(Parameters, {page:vm.productList.Meta.Page + 1}); - return sdkOrderCloud.Me.ListProducts(parameters) + return OrderCloudSDK.Me.ListProducts(parameters) .then(function(data) { vm.productList.Items = vm.productList.Items.concat(data.Items); vm.productList.Meta = data.Meta; diff --git a/src/app/checkout/confirmation/js/confirmation.config.js b/src/app/checkout/confirmation/js/confirmation.config.js index 7ee89595..53cc3185 100644 --- a/src/app/checkout/confirmation/js/confirmation.config.js +++ b/src/app/checkout/confirmation/js/confirmation.config.js @@ -11,28 +11,28 @@ function CheckoutConfirmationConfig($stateProvider) { controller: 'CheckoutConfirmationCtrl', controllerAs: 'checkoutConfirmation', resolve: { - SubmittedOrder: function($stateParams, sdkOrderCloud) { - return sdkOrderCloud.Orders.Get('outgoing', $stateParams.orderid); + SubmittedOrder: function($stateParams, OrderCloudSDK) { + return OrderCloudSDK.Orders.Get('outgoing', $stateParams.orderid); }, - OrderShipAddress: function(SubmittedOrder, sdkOrderCloud){ - return sdkOrderCloud.Me.GetAddress(SubmittedOrder.ShippingAddressID); + OrderShipAddress: function(SubmittedOrder, OrderCloudSDK){ + return OrderCloudSDK.Me.GetAddress(SubmittedOrder.ShippingAddressID); }, - OrderPromotions: function(SubmittedOrder, sdkOrderCloud) { - return sdkOrderCloud.Orders.ListPromotions('outgoing', SubmittedOrder.ID); + OrderPromotions: function(SubmittedOrder, OrderCloudSDK) { + return OrderCloudSDK.Orders.ListPromotions('outgoing', SubmittedOrder.ID); }, - OrderBillingAddress: function(SubmittedOrder, sdkOrderCloud){ - return sdkOrderCloud.Me.GetAddress(SubmittedOrder.BillingAddressID); + OrderBillingAddress: function(SubmittedOrder, OrderCloudSDK){ + return OrderCloudSDK.Me.GetAddress(SubmittedOrder.BillingAddressID); }, - OrderPayments: function($q, SubmittedOrder, sdkOrderCloud) { + OrderPayments: function($q, SubmittedOrder, OrderCloudSDK) { var deferred = $q.defer(); - sdkOrderCloud.Payments.List('outgoing', SubmittedOrder.ID) + OrderCloudSDK.Payments.List('outgoing', SubmittedOrder.ID) .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(); - sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) + OrderCloudSDK.Me.GetCreditCard(payment.CreditCardID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -42,7 +42,7 @@ function CheckoutConfirmationConfig($stateProvider) { } else if (payment.Type === 'SpendingAccount' && payment.SpendingAccountID) { queue.push((function() { var d = $q.defer(); - sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + OrderCloudSDK.Me.GetSpendingAccount(payment.SpendingAccountID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -54,14 +54,14 @@ function CheckoutConfirmationConfig($stateProvider) { $q.all(queue) .then(function() { deferred.resolve(data); - }) + }); }); return deferred.promise; }, - LineItemsList: function($q, $state, toastr, ocLineItems, SubmittedOrder, sdkOrderCloud) { + LineItemsList: function($q, $state, toastr, ocLineItems, SubmittedOrder, OrderCloudSDK) { var dfd = $q.defer(); - sdkOrderCloud.LineItems.List('outgoing', SubmittedOrder.ID, {pageSize: 100}) + OrderCloudSDK.LineItems.List('outgoing', SubmittedOrder.ID, {pageSize: 100}) .then(function(data) { ocLineItems.GetProductInfo(data.Items) .then(function() { diff --git a/src/app/checkout/js/checkout.config.js b/src/app/checkout/js/checkout.config.js index 4daa70c7..0bd96176 100644 --- a/src/app/checkout/js/checkout.config.js +++ b/src/app/checkout/js/checkout.config.js @@ -13,10 +13,10 @@ function CheckoutConfig($urlRouterProvider, $stateProvider) { controller: 'CheckoutCtrl', controllerAs: 'checkout', resolve: { - OrderShipAddress: function($q, sdkOrderCloud, CurrentOrder){ + OrderShipAddress: function($q, OrderCloudSDK, CurrentOrder){ var deferred = $q.defer(); if (CurrentOrder.ShippingAddressID) { - sdkOrderCloud.Me.GetAddress(CurrentOrder.ShippingAddressID) + OrderCloudSDK.Me.GetAddress(CurrentOrder.ShippingAddressID) .then(function(address) { deferred.resolve(address); }) @@ -30,14 +30,14 @@ function CheckoutConfig($urlRouterProvider, $stateProvider) { return deferred.promise; }, - CurrentPromotions: function(CurrentOrder, sdkOrderCloud) { - return sdkOrderCloud.Orders.ListPromotions('outgoing', CurrentOrder.ID); + CurrentPromotions: function(CurrentOrder, OrderCloudSDK) { + return OrderCloudSDK.Orders.ListPromotions('outgoing', CurrentOrder.ID); }, - OrderBillingAddress: function($q, sdkOrderCloud, CurrentOrder){ + OrderBillingAddress: function($q, OrderCloudSDK, CurrentOrder){ var deferred = $q.defer(); if (CurrentOrder.BillingAddressID) { - sdkOrderCloud.Me.GetAddress(CurrentOrder.BillingAddressID) + OrderCloudSDK.Me.GetAddress(CurrentOrder.BillingAddressID) .then(function(address) { deferred.resolve(address); }) diff --git a/src/app/checkout/js/checkout.controller.js b/src/app/checkout/js/checkout.controller.js index 015476be..7f43e632 100644 --- a/src/app/checkout/js/checkout.controller.js +++ b/src/app/checkout/js/checkout.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CheckoutCtrl', CheckoutController) ; -function CheckoutController($exceptionHandler, $state, $rootScope, toastr, sdkOrderCloud, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { +function CheckoutController($exceptionHandler, $state, $rootScope, toastr, OrderCloudSDK, OrderShipAddress, CurrentPromotions, OrderBillingAddress, CheckoutConfig) { var vm = this; vm.shippingAddress = OrderShipAddress; vm.billingAddress = OrderBillingAddress; @@ -10,7 +10,7 @@ function CheckoutController($exceptionHandler, $state, $rootScope, toastr, sdkOr vm.checkoutConfig = CheckoutConfig; vm.submitOrder = function(order) { - sdkOrderCloud.Orders.Submit('outgoing', order.ID) + OrderCloudSDK.Orders.Submit('outgoing', order.ID) .then(function(order) { $state.go('confirmation', {orderid:order.ID}, {reload:'base'}); toastr.success('Your order was successfully submitted.'); @@ -22,28 +22,28 @@ function CheckoutController($exceptionHandler, $state, $rootScope, toastr, sdkOr }; $rootScope.$on('OC:OrderShipAddressUpdated', function(event, order) { - sdkOrderCloud.Me.GetAddress(order.ShippingAddressID) + OrderCloudSDK.Me.GetAddress(order.ShippingAddressID) .then(function(address){ vm.shippingAddress = address; }); }); $rootScope.$on('OC:OrderBillAddressUpdated', function(event, order){ - sdkOrderCloud.Me.GetAddress(order.BillingAddressID) + OrderCloudSDK.Me.GetAddress(order.BillingAddressID) .then(function(address){ vm.billingAddress = address; }); }); vm.removePromotion = function(order, promotion) { - sdkOrderCloud.Orders.RemovePromotion('outgoing', order.ID, promotion.Code) + OrderCloudSDK.Orders.RemovePromotion('outgoing', order.ID, promotion.Code) .then(function() { $rootScope.$broadcast('OC:UpdatePromotions', order.ID); }); }; $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { - sdkOrderCloud.Orders.ListPromotions('outgoing', orderid) + OrderCloudSDK.Orders.ListPromotions('outgoing', orderid) .then(function(data) { if (data.Meta) { vm.promotions = data.Items; diff --git a/src/app/checkout/js/checkoutAddressSelect.service.js b/src/app/checkout/js/checkoutAddressSelect.service.js index 90b95e3c..c520d8c2 100644 --- a/src/app/checkout/js/checkoutAddressSelect.service.js +++ b/src/app/checkout/js/checkoutAddressSelect.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocAddressSelect', OrderCloudAddressSelectService) ; -function OrderCloudAddressSelectService($uibModal, sdkOrderCloud) { +function OrderCloudAddressSelectService($uibModal, OrderCloudSDK) { var service = { Open: _open }; @@ -15,7 +15,7 @@ function OrderCloudAddressSelectService($uibModal, sdkOrderCloud) { backdrop: 'static', size: 'md', resolve: { - Addresses: function(sdkOrderCloud) { + Addresses: function(OrderCloudSDK) { var options = { page: 1, pageSize: 100 @@ -27,7 +27,7 @@ function OrderCloudAddressSelectService($uibModal, sdkOrderCloud) { options.filters = {Billing: true}; } - return sdkOrderCloud.Me.ListAddresses(options); + return OrderCloudSDK.Me.ListAddresses(options); } } }).result; diff --git a/src/app/checkout/payment/directives/js/creditCard.controller.js b/src/app/checkout/payment/directives/js/creditCard.controller.js index efdca8f4..b3540a95 100644 --- a/src/app/checkout/payment/directives/js/creditCard.controller.js +++ b/src/app/checkout/payment/directives/js/creditCard.controller.js @@ -2,18 +2,18 @@ angular.module('orderCloud') .controller('PaymentCreditCardCtrl', PaymentCreditCardController) ; -function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, CheckoutConfig, sdkOrderCloud, ocMyCreditCards, ocCheckoutPaymentService) { +function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHandler, toastr, CheckoutConfig, OrderCloudSDK, ocMyCreditCards, ocCheckoutPaymentService) { var creditCardListOptions = { page: 1, pageSize: 100 }; - sdkOrderCloud.Me.ListCreditCards(creditCardListOptions) + OrderCloudSDK.Me.ListCreditCards(creditCardListOptions) .then(function(data) { $scope.creditCards = data.Items; }); if (!$scope.payment) { - sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + OrderCloudSDK.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { $scope.payment = data.Items[0]; @@ -44,7 +44,7 @@ function PaymentCreditCardController($scope, $rootScope, $filter, $exceptionHand page: 1, pageSize: 100 }; - sdkOrderCloud.Me.ListCreditCards(creditCardListOptions) + OrderCloudSDK.Me.ListCreditCards(creditCardListOptions) .then(function(data) { $scope.creditCards = data.Items; if ($scope.payment.CreditCardID) { diff --git a/src/app/checkout/payment/directives/js/payment.controller.js b/src/app/checkout/payment/directives/js/payment.controller.js index 61b58ffa..b1f1a90e 100644 --- a/src/app/checkout/payment/directives/js/payment.controller.js +++ b/src/app/checkout/payment/directives/js/payment.controller.js @@ -2,10 +2,10 @@ angular.module('orderCloud') .controller('PaymentCtrl', PaymentController) ; -function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { +function PaymentController($scope, $rootScope, OrderCloudSDK, ocCheckoutPaymentService, CheckoutConfig) { if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; if (!$scope.payment) { - sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + OrderCloudSDK.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (ocCheckoutPaymentService.PaymentsExceedTotal(data, $scope.order.Total)) { ocCheckoutPaymentService.RemoveAllPayments(data, $scope.order) @@ -49,7 +49,7 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS $scope.savePayment = function(payment) { if (payment.ID) { - sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, payment.ID) + OrderCloudSDK.Payments.Delete('outgoing', $scope.order.ID, payment.ID) .then(function() { delete payment.ID; createPayment(payment); @@ -60,7 +60,7 @@ function PaymentController($scope, $rootScope, sdkOrderCloud, ocCheckoutPaymentS function createPayment(newPayment) { if (angular.isDefined(newPayment.Accepted)) delete newPayment.Accepted; - sdkOrderCloud.Payments.Create('outgoing', $scope.order.ID, newPayment) + OrderCloudSDK.Payments.Create('outgoing', $scope.order.ID, newPayment) .then(function(data) { data.Editing = false; $scope.OCPayment.$setValidity('ValidPayment', true); diff --git a/src/app/checkout/payment/directives/js/payments.controller.js b/src/app/checkout/payment/directives/js/payments.controller.js index c749fc74..c5b964b0 100644 --- a/src/app/checkout/payment/directives/js/payments.controller.js +++ b/src/app/checkout/payment/directives/js/payments.controller.js @@ -4,10 +4,10 @@ angular.module('orderCloud') //TODO: Refactor for multiple payments without Payments.Patch -function PaymentsController($rootScope, $scope, $filter, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService, CheckoutConfig) { +function PaymentsController($rootScope, $scope, $filter, $exceptionHandler, toastr, OrderCloudSDK, ocCheckoutPaymentService, CheckoutConfig) { if (!$scope.methods) $scope.methods = CheckoutConfig.AvailablePaymentMethods; - sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + OrderCloudSDK.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (!data.Items.length) { $scope.payments = {Items: []}; @@ -44,7 +44,7 @@ function PaymentsController($rootScope, $scope, $filter, $exceptionHandler, toas $scope.removePayment = function(scope) { // TODO: when api bug EX-1053 is fixed refactor this to simply delete the payment - return sdkOrderCloud.Payments.Delete('outgoing', $scope.order.ID, scope.payment.ID) + return OrderCloudSDK.Payments.Delete('outgoing', $scope.order.ID, scope.payment.ID) .then(function(){ $scope.payments.Items.splice(scope.$index, 1); calculateMaxTotal(); @@ -55,7 +55,7 @@ function PaymentsController($rootScope, $scope, $filter, $exceptionHandler, toas $scope.updatePaymentAmount = function(scope) { if (scope.payment.Amount > scope.payment.MaxAmount || !scope.payment.Amount) return; //TODO: Buyer Users currently cannot patch a payment - we need to refactor for multiple payments - sdkOrderCloud.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, scope.payment) + OrderCloudSDK.Payments.Patch('outgoing', $scope.order.ID, scope.payment.ID, scope.payment) .then(function(data) { toastr.success('Payment amount updated to ' + $filter('currency')(scope.payment.Amount)); calculateMaxTotal(); diff --git a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js index 076376fb..13f8b0d0 100644 --- a/src/app/checkout/payment/directives/js/purchaseOrder.controller.js +++ b/src/app/checkout/payment/directives/js/purchaseOrder.controller.js @@ -2,9 +2,9 @@ angular.module('orderCloud') .controller('PaymentPurchaseOrderCtrl', PaymentPurchaseOrderController) ; -function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud) { +function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, toastr, OrderCloudSDK) { if (!$scope.payment) { - sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + OrderCloudSDK.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { $scope.payment.Items[0]; @@ -22,8 +22,8 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t $scope.payment = payment; } }); - } else if (!($scope.payment.Type == "PurchaseOrder" && $scope.payment.CreditCardID == null && $scope.payment.SpendingAccountID == null)) { - $scope.payment.Type = "PurchaseOrder"; + } else if (!($scope.payment.Type == 'PurchaseOrder' && $scope.payment.CreditCardID == null && $scope.payment.SpendingAccountID == null)) { + $scope.payment.Type = 'PurchaseOrder'; $scope.payment.CreditCardID = null; $scope.payment.SpendingAccountID = null; } else { @@ -31,7 +31,7 @@ function PaymentPurchaseOrderController($scope, $rootScope, $exceptionHandler, t $scope.payment.SpendingAccountID = null; } - $scope.$watch('payment', function(n,o) { + $scope.$watch('payment', function(n, o) { if (n.Editing) { $scope.OCPaymentPurchaseOrder.$setValidity('PurchaseOrderNotSaved', false); } else { diff --git a/src/app/checkout/payment/directives/js/spendingAccount.controller.js b/src/app/checkout/payment/directives/js/spendingAccount.controller.js index 66be0fd2..54519d22 100644 --- a/src/app/checkout/payment/directives/js/spendingAccount.controller.js +++ b/src/app/checkout/payment/directives/js/spendingAccount.controller.js @@ -2,9 +2,9 @@ angular.module('orderCloud') .controller('PaymentSpendingAccountCtrl', PaymentSpendingAccountController) ; -function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, sdkOrderCloud, ocCheckoutPaymentService) { +function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, toastr, OrderCloudSDK, ocCheckoutPaymentService) { if (!$scope.payment) { - sdkOrderCloud.Payments.List('outgoing', $scope.order.ID) + OrderCloudSDK.Payments.List('outgoing', $scope.order.ID) .then(function(data) { if (data.Items.length) { $scope.payment = data.Items[0]; @@ -36,7 +36,7 @@ function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, pageSize: 100, filters: {RedemptionCode: '!*', AllowAsPaymentMethod: true} }; - sdkOrderCloud.Me.ListSpendingAccounts(spendingAccountListOptions) + OrderCloudSDK.Me.ListSpendingAccounts(spendingAccountListOptions) .then(function(data) { $scope.spendingAccounts = data.Items; if ($scope.payment.SpendingAccountID) { @@ -56,7 +56,7 @@ function PaymentSpendingAccountController($scope, $rootScope, $exceptionHandler, }); }; - $scope.$watch('payment', function(n,o) { + $scope.$watch('payment', function(n, o) { if (n && !n.SpendingAccountID || n.Editing) { $scope.OCPaymentSpendingAccount.$setValidity('SpendingAccountNotSet', false); } else { diff --git a/src/app/checkout/payment/js/payment.controller.js b/src/app/checkout/payment/js/payment.controller.js index 56e64988..82186090 100644 --- a/src/app/checkout/payment/js/payment.controller.js +++ b/src/app/checkout/payment/js/payment.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CheckoutPaymentCtrl', CheckoutPaymentController) ; -function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, sdkOrderCloud, ocAddressSelect, ocMyAddresses) { +function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, OrderCloudSDK, ocAddressSelect, ocMyAddresses) { var vm = this; vm.createAddress = createAddress; vm.changeBillingAddress = changeBillingAddress; @@ -30,7 +30,7 @@ function CheckoutPaymentController($exceptionHandler, $rootScope, toastr, sdkOrd function saveBillingAddress(order) { if (order && order.BillingAddressID) { - sdkOrderCloud.Orders.Patch('outgoing', order.ID, {BillingAddressID: order.BillingAddressID}) + OrderCloudSDK.Orders.Patch('outgoing', order.ID, {BillingAddressID: order.BillingAddressID}) .then(function(updatedOrder) { $rootScope.$broadcast('OC:OrderBillAddressUpdated', updatedOrder); }) diff --git a/src/app/checkout/payment/js/payment.service.js b/src/app/checkout/payment/js/payment.service.js index 71f820cd..01767df4 100644 --- a/src/app/checkout/payment/js/payment.service.js +++ b/src/app/checkout/payment/js/payment.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocCheckoutPaymentService', OrderCloudCheckoutPaymentService) ; -function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { +function OrderCloudCheckoutPaymentService($q, $uibModal, OrderCloudSDK) { var service = { PaymentsExceedTotal: _paymentsExceedTotal, RemoveAllPayments: _removeAllPayments, @@ -24,7 +24,7 @@ function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { var queue = []; angular.forEach(payments.Items, function(payment) { - queue.push(sdkOrderCloud.Payments.Delete('outgoing', order.ID, payment.ID)); + queue.push(OrderCloudSDK.Payments.Delete('outgoing', order.ID, payment.ID)); }); $q.all(queue).then(function() { @@ -41,13 +41,13 @@ function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { controllerAs: 'selectPaymentAccount', size: 'md', resolve: { - Accounts: function(sdkOrderCloud) { + Accounts: function(OrderCloudSDK) { var options = {page: 1, pageSize: 100}; if (payment.Type == 'SpendingAccount') { options.filters = {RedemptionCode: '!*', AllowAsPaymentMethod: true}; - return sdkOrderCloud.Me.ListSpendingAccounts(options); + return OrderCloudSDK.Me.ListSpendingAccounts(options); } else { - return sdkOrderCloud.Me.ListCreditCards(options); + return OrderCloudSDK.Me.ListCreditCards(options); } }, Payment: function() { @@ -64,7 +64,7 @@ function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { var df = $q.defer(); if (payment.ID) { - sdkOrderCloud.Payments.Delete('outgoing', order.ID, payment.ID) + OrderCloudSDK.Payments.Delete('outgoing', order.ID, payment.ID) .then(function() { delete payment.ID; createPayment(payment); @@ -75,7 +75,7 @@ function OrderCloudCheckoutPaymentService($q, $uibModal, sdkOrderCloud) { function createPayment(newPayment) { if (angular.isDefined(newPayment.Accepted)) delete newPayment.Accepted; - sdkOrderCloud.Payments.Create('outgoing', order.ID, newPayment) + OrderCloudSDK.Payments.Create('outgoing', order.ID, newPayment) .then(function(data) { if (data.SpendingAccountID) data.SpendingAccount = account; if (data.CreditCardID) data.CreditCard = account; diff --git a/src/app/checkout/review/js/review.config.js b/src/app/checkout/review/js/review.config.js index 7655f423..7cc9d03e 100644 --- a/src/app/checkout/review/js/review.config.js +++ b/src/app/checkout/review/js/review.config.js @@ -10,9 +10,9 @@ function CheckoutReviewConfig($stateProvider) { controller: 'CheckoutReviewCtrl', controllerAs: 'checkoutReview', resolve: { - LineItemsList: function($q, $state, toastr, sdkOrderCloud, ocLineItems, CurrentOrder) { + LineItemsList: function($q, $state, toastr, OrderCloudSDK, ocLineItems, CurrentOrder) { var dfd = $q.defer(); - sdkOrderCloud.LineItems.List('outgoing', CurrentOrder.ID, {pageSize: 100}) + OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID, {pageSize: 100}) .then(function(data) { if (!data.Items.length) { dfd.resolve(data); @@ -30,8 +30,8 @@ function CheckoutReviewConfig($stateProvider) { }); return dfd.promise; }, - OrderPaymentsDetail: function($q, sdkOrderCloud, CurrentOrder, $state) { - return sdkOrderCloud.Payments.List('outgoing', CurrentOrder.ID) + OrderPaymentsDetail: function($q, OrderCloudSDK, CurrentOrder, $state) { + return OrderCloudSDK.Payments.List('outgoing', CurrentOrder.ID) .then(function(data) { //TODO: create a queue that can be resolved var dfd = $q.defer(); @@ -44,7 +44,7 @@ function CheckoutReviewConfig($stateProvider) { if (payment.Type === 'CreditCard' && payment.CreditCardID) { queue.push((function() { var d = $q.defer(); - sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) + OrderCloudSDK.Me.GetCreditCard(payment.CreditCardID) .then(function(cc) { data.Items[index].Details = cc; d.resolve(); @@ -55,7 +55,7 @@ function CheckoutReviewConfig($stateProvider) { if (payment.Type === 'SpendingAccount' && payment.SpendingAccountID) { queue.push((function() { var d = $q.defer(); - sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + OrderCloudSDK.Me.GetSpendingAccount(payment.SpendingAccountID) .then(function(sa) { data.Items[index].Details = sa; d.resolve(); diff --git a/src/app/checkout/shipping/js/shipping.controller.js b/src/app/checkout/shipping/js/shipping.controller.js index 5e250b4f..321ee740 100644 --- a/src/app/checkout/shipping/js/shipping.controller.js +++ b/src/app/checkout/shipping/js/shipping.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CheckoutShippingCtrl', CheckoutShippingController) ; -function CheckoutShippingController($exceptionHandler, $rootScope, toastr, sdkOrderCloud, ocMyAddresses, ocAddressSelect, ocShippingRates, CheckoutConfig) { +function CheckoutShippingController($exceptionHandler, $rootScope, toastr, OrderCloudSDK, ocMyAddresses, ocAddressSelect, ocShippingRates, CheckoutConfig) { var vm = this; vm.createAddress = createAddress; vm.changeShippingAddress = changeShippingAddress; @@ -35,7 +35,7 @@ function CheckoutShippingController($exceptionHandler, $rootScope, toastr, sdkOr function saveShipAddress(order) { if (order && order.ShippingAddressID) { - sdkOrderCloud.Orders.Patch('outgoing', order.ID, {ShippingAddressID: order.ShippingAddressID}) + OrderCloudSDK.Orders.Patch('outgoing', order.ID, {ShippingAddressID: order.ShippingAddressID}) .then(function(updatedOrder) { $rootScope.$broadcast('OC:OrderShipAddressUpdated', updatedOrder); vm.getShippingRates(order); diff --git a/src/app/checkout/shipping/js/shippingRates.service.js b/src/app/checkout/shipping/js/shippingRates.service.js index 8b05a778..2aeb47d5 100644 --- a/src/app/checkout/shipping/js/shippingRates.service.js +++ b/src/app/checkout/shipping/js/shippingRates.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocShippingRates', OrderCloudShippingRatesService) ; -function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, buyerid) { +function OrderCloudShippingRatesService($q, $resource, OrderCloudSDK, apiurl, buyerid) { var service = { GetRates: _getRates, GetLineItemRates: _getLineItemRates, @@ -22,7 +22,7 @@ function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, bu OrderID: order.ID }; - $resource(shippingRatesURL, {}, {getrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).getrates(request).$promise + $resource(shippingRatesURL, {}, {getrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloudSDK.GetToken()}}}).getrates(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody.Shipments); }) @@ -42,7 +42,7 @@ function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, bu OrderID: order.ID }; - $resource(shippingRatesURL, {}, {getlineitemrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).getlineitemrates(request).$promise + $resource(shippingRatesURL, {}, {getlineitemrates: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloudSDK.GetToken()}}}).getlineitemrates(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody.Shipments); }) @@ -63,7 +63,7 @@ function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, bu ShippingCost: cost }; - $resource(shippingRatesURL, {}, {setshippingcost: {method: 'POST', headers: {'Authorization': 'Bearer ' + sdkOrderCloud.GetToken()}}}).setshippingcost(request).$promise + $resource(shippingRatesURL, {}, {setshippingcost: {method: 'POST', headers: {'Authorization': 'Bearer ' + OrderCloudSDK.GetToken()}}}).setshippingcost(request).$promise .then(function(data) { deferred.resolve(data.ResponseBody); }) @@ -91,7 +91,7 @@ function OrderCloudShippingRatesService($q, $resource, sdkOrderCloud, apiurl, bu } }); - sdkOrderCloud.Orders.Patch('outgoing', order.ID, {xp: xpPatch}) + OrderCloudSDK.Orders.Patch('outgoing', order.ID, {xp: xpPatch}) .then(function() { updateShippingCost(); }) diff --git a/src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js b/src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js new file mode 100644 index 00000000..885842a1 --- /dev/null +++ b/src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js @@ -0,0 +1,9 @@ +angular.module('orderCloud') + .run(OrderCloudAngularSDKConfig) +; + +function OrderCloudAngularSDKConfig(OrderCloudSDK, appname, apiurl, authurl) { + var cookiePrefix = appname.replace(/ /g, '_').toLowerCase(); + var apiVersion = 'v1'; + OrderCloudSDK.Config(cookiePrefix, apiurl + '/' + apiVersion, authurl); +} \ No newline at end of file diff --git a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js index c8f7d728..b276d108 100644 --- a/src/app/common/directives/oc-quantity-input/oc-quantity-input.js +++ b/src/app/common/directives/oc-quantity-input/oc-quantity-input.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .directive('ocQuantityInput', OCQuantityInput) ; -function OCQuantityInput($log, $rootScope, toastr, sdkOrderCloud) { +function OCQuantityInput($log, $rootScope, toastr, OrderCloudSDK) { return { scope: { product: '=', @@ -22,7 +22,7 @@ function OCQuantityInput($log, $rootScope, toastr, sdkOrderCloud) { scope.content = 'lineitem'; scope.updateQuantity = function () { if (scope.item.Quantity > 0) { - sdkOrderCloud.LineItems.Patch('outgoing', scope.order.ID, scope.item.ID, { + OrderCloudSDK.LineItems.Patch('outgoing', scope.order.ID, scope.item.ID, { Quantity: scope.item.Quantity }) .then(function (data) { diff --git a/src/app/common/services/oc-authnet/oc-authnet.js b/src/app/common/services/oc-authnet/oc-authnet.js index cbc9f280..e89b438d 100644 --- a/src/app/common/services/oc-authnet/oc-authnet.js +++ b/src/app/common/services/oc-authnet/oc-authnet.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocAuthNet', AuthorizeNet) ; -function AuthorizeNet( $q, $resource, sdkOrderCloud, apiurl, ocCreditCardUtility) { +function AuthorizeNet( $q, $resource, OrderCloudSDK, apiurl, ocCreditCardUtility) { return { 'CreateCreditCard': _createCreateCard, 'UpdateCreditCard': _updateCreditCard, @@ -58,7 +58,7 @@ function AuthorizeNet( $q, $resource, sdkOrderCloud, apiurl, ocCreditCardUtility callApi: { method: method, headers: { - 'Authorization': 'Bearer ' + sdkOrderCloud.GetToken() + 'Authorization': 'Bearer ' + OrderCloudSDK.GetToken() } } }).callApi(requestBody).$promise diff --git a/src/app/common/services/oc-lineitems/oc-lineitems.js b/src/app/common/services/oc-lineitems/oc-lineitems.js index b608e8a6..522527d1 100644 --- a/src/app/common/services/oc-lineitems/oc-lineitems.js +++ b/src/app/common/services/oc-lineitems/oc-lineitems.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocLineItems', LineItemFactory) ; -function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, catalogid) { +function LineItemFactory($rootScope, $q, $uibModal, OrderCloudSDK, catalogid) { return { SpecConvert: _specConvert, AddItem: _addItem, @@ -44,7 +44,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c Specs: _specConvert(product.Specs) }; li.ShippingAddressID = isSingleShipping(order) ? getSingleShippingAddressID(order) : null; - sdkOrderCloud.LineItems.Create('outgoing', order.ID, li) + OrderCloudSDK.LineItems.Create('outgoing', order.ID, li) .then(function(lineItem) { $rootScope.$broadcast('OC:UpdateOrder', order.ID); deferred.resolve(); @@ -70,7 +70,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c var dfd = $q.defer(); var queue = []; angular.forEach(productIDs, function (productid) { - queue.push(sdkOrderCloud.Me.GetProduct(catalogid, productid)); + queue.push(OrderCloudSDK.Me.GetProduct(catalogid, productid)); }); $q.all(queue) .then(function (results) { @@ -94,7 +94,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c modalInstance.result .then(function (address) { address.ID = Math.floor(Math.random() * 1000000).toString(); - sdkOrderCloud.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address) + OrderCloudSDK.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address) .then(function () { $rootScope.$broadcast('LineItemAddressUpdated', LineItem.ID, address); }); @@ -102,9 +102,9 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c } function _updateShipping(Order, LineItem, AddressID) { - sdkOrderCloud.Me.GetAddress(AddressID) + OrderCloudSDK.Me.GetAddress(AddressID) .then(function (address) { - sdkOrderCloud.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address); + OrderCloudSDK.LineItems.SetShippingAddress('outgoing', Order.ID, LineItem.ID, address); $rootScope.$broadcast('LineItemAddressUpdated', LineItem.ID, address); }); } @@ -117,7 +117,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c page: 1, pageSize: 100 }; - sdkOrderCloud.LineItems.List('outgoing', orderID, options) + OrderCloudSDK.LineItems.List('outgoing', orderID, options) .then(function (data) { li = data; if (data.Meta.TotalPages > data.Meta.Page) { @@ -125,7 +125,7 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloud, sdkOrderCloud, c while (page < data.Meta.TotalPages) { page++; options.page = page; - queue.push(sdkOrderCloud.LineItems.List('outgoing', orderID, options)); + queue.push(OrderCloudSDK.LineItems.List('outgoing', orderID, options)); } } $q.all(queue) diff --git a/src/app/common/services/oc-roles/oc-roles.js b/src/app/common/services/oc-roles/oc-roles.js index 943df39d..08420e5a 100644 --- a/src/app/common/services/oc-roles/oc-roles.js +++ b/src/app/common/services/oc-roles/oc-roles.js @@ -3,7 +3,7 @@ angular.module('orderCloud') .provider('ocRoles', OrderCloudRolesProvider) ; -function OrderCloudRolesService($window, sdkOrderCloud) { +function OrderCloudRolesService($window, OrderCloudSDK) { var service = { Set: _set, Get: _get, @@ -54,7 +54,7 @@ function OrderCloudRolesService($window, sdkOrderCloud) { //Returns local service variable or obtains roles again from token function _get() { - return roles || _set(sdkOrderCloud.GetToken()); + return roles || _set(OrderCloudSDK.GetToken()); } //Removes local service variable @@ -89,16 +89,16 @@ function OrderCloudRolesProvider() { GetRoleGroups: function() { return roleGroups; } - } + }; }, AddRoleGroup: function(roleGroup) { - if (!roleGroup.Name) throw "ocRoles: RoleGroup must have a Name value"; - if (!roleGroup.Roles || !roleGroup.Roles.length) throw "ocRoles: RoleGroup must have Roles"; - if (!angular.isArray(roleGroup.Roles)) throw "ocRoles: RoleGroup Roles must be an array"; - if (!roleGroup.Type || ['All', 'Any'].indexOf(roleGroup.Type) == -1) throw "ocRoles: RoleGroup Type must be 'All' or 'Any'"; + if (!roleGroup.Name) throw 'ocRoles: RoleGroup must have a Name value'; + if (!roleGroup.Roles || !roleGroup.Roles.length) throw 'ocRoles: RoleGroup must have Roles'; + if (!angular.isArray(roleGroup.Roles)) throw 'ocRoles: RoleGroup Roles must be an array'; + if (!roleGroup.Type || ['All', 'Any'].indexOf(roleGroup.Type) == -1) throw 'ocRoles: RoleGroup Type must be \'All\' or \'Any\''; roleGroups[roleGroup.Name] = roleGroup; } - } + }; } \ No newline at end of file diff --git a/src/app/common/services/oc-wrapper/oc-wrapper.js b/src/app/common/services/oc-wrapper/oc-wrapper.js deleted file mode 100644 index cef77866..00000000 --- a/src/app/common/services/oc-wrapper/oc-wrapper.js +++ /dev/null @@ -1,79 +0,0 @@ -angular.module('orderCloud') - //TODO: rename this to 'OrderCloud' once we finish refactoring to the new SDK - .factory('sdkOrderCloud', OrderCloudService) -; - -function OrderCloudService($cookies, $rootScope, $q, appname, apiurl, authurl) { - // get sdk from global variable - var sdk = {}; - var defaultClient = OrderCloudSDK.ApiClient.instance; - var oauth2 = defaultClient.authentications['oauth2']; - var cookieAppName = appname.replace(/ /g, '_').toLowerCase(); - var authTokenCookieName = cookieAppName + '.token'; - var impersonationTokenCookieName = cookieAppName + '.impersonation.token'; - var refreshTokenCookieName = cookieAppName + '.refresh.token'; - OrderCloudSDK.ApiClient.instance.baseApiPath = apiurl + '/v1'; - OrderCloudSDK.ApiClient.instance.baseAuthPath = authurl; - for(var method in OrderCloudSDK) { - if (OrderCloudSDK.hasOwnProperty(method)) { - sdk[method] = {}; - for (var apiCall in OrderCloudSDK[method]) { - if (OrderCloudSDK[method].hasOwnProperty(apiCall)) { - sdk[method][apiCall] = (function() { - var useMethod = method, - useApiCall = apiCall; - return function() { - var dfd = $q.defer(); - dfd.resolve(OrderCloudSDK[useMethod][useApiCall].apply(OrderCloudSDK[useMethod], arguments)); - return dfd.promise; - } - })(); - } - } - } - } - - var _getToken = function() { - var token = $cookies.get(authTokenCookieName); - oauth2.accessToken = token; - return token; - }; - - var _getImpersonationToken = function() { - var token = $cookies.get(impersonationTokenCookieName); - oauth2.impersonationToken = token; - return token; - }; - - var _getRefreshToken = function() { - var token = $cookies.get(refreshTokenCookieName); - return token; - } - - var _setToken = function(token) { - oauth2.accessToken = token; - $cookies.put(authTokenCookieName, token); - }; - - var _setImpersonationToken = function(token) { - oauth2.impersonationToken = token; - $cookies.put(impersonationTokenCookieName, token); - }; - - var _setRefreshToken = function(token) { - $cookies.put(refreshTokenCookieName, token); - } - - sdk.GetToken = _getToken; - sdk.GetImpersonationToken = _getImpersonationToken; - sdk.GetRefreshToken = _getRefreshToken; - sdk.SetToken = _setToken; - sdk.SetImpersonationToken = _setImpersonationToken; - sdk.SetRefreshToken = _setRefreshToken; - - //init authentication for page refresh - _getToken(); - _getImpersonationToken(); - - return sdk; -} \ No newline at end of file diff --git a/src/app/favoriteOrders/js/favoriteOrders.component.js b/src/app/favoriteOrders/js/favoriteOrders.component.js index 896f1026..2106f92d 100644 --- a/src/app/favoriteOrders/js/favoriteOrders.component.js +++ b/src/app/favoriteOrders/js/favoriteOrders.component.js @@ -16,7 +16,7 @@ function OrderCloudFavoriteOrderComponent() { return component; } -function FavoriteOrderController(toastr, sdkOrderCloud){ +function FavoriteOrderController(toastr, OrderCloudSDK){ var vm = this; vm.$onInit = function(){ vm.hasFavorites = !!vm.currentUser && !!vm.currentUser.xp && !!vm.currentUser.xp.FavoriteOrders; @@ -35,7 +35,7 @@ function FavoriteOrderController(toastr, sdkOrderCloud){ function addOrder(existingList) { existingList.push(vm.order.ID); - sdkOrderCloud.Me.Patch({xp: {FavoriteOrders: existingList}}) + OrderCloudSDK.Me.Patch({xp: {FavoriteOrders: existingList}}) .then(function(){ vm.isFavorited = true; toastr.success('Saved to your favorite orders.'); @@ -44,7 +44,7 @@ function FavoriteOrderController(toastr, sdkOrderCloud){ function removeOrder(){ var updatedList = _.without(vm.currentUser.xp.FavoriteOrders, vm.order.ID); - sdkOrderCloud.Me.Patch({xp: {FavoriteOrders: updatedList}}) + OrderCloudSDK.Me.Patch({xp: {FavoriteOrders: updatedList}}) .then(function(){ vm.isFavorited = false; vm.currentUser.xp.FavoriteOrders = updatedList; diff --git a/src/app/favoriteProducts/js/favoriteProduct.controller.js b/src/app/favoriteProducts/js/favoriteProduct.controller.js index 3fb8a443..8c4f4964 100644 --- a/src/app/favoriteProducts/js/favoriteProduct.controller.js +++ b/src/app/favoriteProducts/js/favoriteProduct.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('FavoriteProductCtrl', FavoriteProductController) ; -function FavoriteProductController($scope, sdkOrderCloud, toastr){ +function FavoriteProductController($scope, OrderCloudSDK, toastr){ var vm = this; vm.checkHasFavorites = checkHasFavorites; vm.toggleFavoriteProduct = toggleFavoriteProduct; @@ -35,7 +35,7 @@ function FavoriteProductController($scope, sdkOrderCloud, toastr){ $scope.currentUser.xp ={}; $scope.currentUser.xp.FavoriteProducts = []; } - sdkOrderCloud.Me.Patch({xp:$scope.currentUser.xp}) + OrderCloudSDK.Me.Patch({xp:$scope.currentUser.xp}) .then(function(){ vm.hasFavorites = true; }) @@ -47,7 +47,7 @@ function FavoriteProductController($scope, sdkOrderCloud, toastr){ function addProduct(existingList){ existingList.push($scope.product.ID); - sdkOrderCloud.Me.Patch({xp: {FavoriteProducts: existingList}}) + OrderCloudSDK.Me.Patch({xp: {FavoriteProducts: existingList}}) .then(function(data){ vm.hasFavorites = data.xp && data.xp.FavoriteProducts; vm.isFavorited = true; @@ -57,7 +57,7 @@ function FavoriteProductController($scope, sdkOrderCloud, toastr){ function removeProduct(){ var updatedList = _.without($scope.currentUser.xp.FavoriteProducts, $scope.product.ID); - sdkOrderCloud.Me.Patch({xp: {FavoriteProducts: updatedList}}) + OrderCloudSDK.Me.Patch({xp: {FavoriteProducts: updatedList}}) .then(function(){ vm.isFavorited = false; $scope.currentUser.xp.FavoriteProducts = updatedList; diff --git a/src/app/favoriteProducts/js/favoriteProducts.config.js b/src/app/favoriteProducts/js/favoriteProducts.config.js index 3b9442bb..cc36b371 100644 --- a/src/app/favoriteProducts/js/favoriteProducts.config.js +++ b/src/app/favoriteProducts/js/favoriteProducts.config.js @@ -11,16 +11,16 @@ function FavoriteProductsConfig($stateProvider){ controller: 'FavoriteProductsCtrl', controllerAs: 'favoriteProducts', data: { - pageTitle: "Favorite Products" + pageTitle: 'Favorite Products' }, resolve: { Parameters: function ($stateParams, ocParameters) { return ocParameters.Get($stateParams); }, - FavoriteProducts: function(sdkOrderCloud, Parameters, CurrentUser){ + FavoriteProducts: function(OrderCloudSDK, Parameters, CurrentUser){ if (CurrentUser.xp && CurrentUser.xp.FavoriteProducts.length) { var parameters = angular.extend(Parameters, {pageSize: Parameters.pageSize || 6, filters: {ID: CurrentUser.xp.FavoriteProducts.join('|')}}); - return sdkOrderCloud.Me.ListProducts(parameters); + return OrderCloudSDK.Me.ListProducts(parameters); } else { return null; } diff --git a/src/app/favoriteProducts/js/favoriteProducts.controller.js b/src/app/favoriteProducts/js/favoriteProducts.controller.js index f93cc3d1..1918f24e 100644 --- a/src/app/favoriteProducts/js/favoriteProducts.controller.js +++ b/src/app/favoriteProducts/js/favoriteProducts.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('FavoriteProductsCtrl', FavoriteProductsController) ; -function FavoriteProductsController(ocParameters, sdkOrderCloud, $state, $ocMedia, Parameters, CurrentUser, FavoriteProducts){ +function FavoriteProductsController(ocParameters, OrderCloudSDK, $state, $ocMedia, Parameters, CurrentUser, FavoriteProducts){ var vm = this; vm.currentUser = CurrentUser; vm.list = FavoriteProducts; @@ -58,7 +58,7 @@ function FavoriteProductsController(ocParameters, sdkOrderCloud, $state, $ocMedi //load the next page of results with all the same parameters vm.loadMore = function() { var parameters = angular.extend(Parameters, {page:vm.list.Meta.Page + 1}); - return sdkOrderCloud.Me.ListProducts(parameters) + return OrderCloudSDK.Me.ListProducts(parameters) .then(function(data) { vm.list.Items = vm.list.Items.concat(data.Items); vm.list.Meta = data.Meta; diff --git a/src/app/login/js/login.controller.js b/src/app/login/js/login.controller.js index 4b7c4372..c067db3d 100644 --- a/src/app/login/js/login.controller.js +++ b/src/app/login/js/login.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('LoginCtrl', LoginController) ; -function LoginController($state, $stateParams, $exceptionHandler, OrderCloud, sdkOrderCloud, LoginService, ocRolesService, buyerid, clientid, scope) { +function LoginController($state, $stateParams, $exceptionHandler, OrderCloudSDK, LoginService, ocRolesService, buyerid, clientid, scope) { var vm = this; vm.credentials = { Username: null, @@ -16,11 +16,10 @@ function LoginController($state, $stateParams, $exceptionHandler, OrderCloud, sd vm.rememberStatus = false; vm.submit = function() { - vm.loading = sdkOrderCloud.Auth.Login(vm.credentials.Username, vm.credentials.Password, clientid, scope) + vm.loading = OrderCloudSDK.Auth.Login(vm.credentials.Username, vm.credentials.Password, clientid, scope) .then(function(data) { - sdkOrderCloud.SetToken(data.access_token); - OrderCloud.Auth.SetToken(data.access_token); //TODO: remove this line after refactor is complete - if (vm.rememberStatus) sdkOrderCloud.SetRefreshToken(data['refresh_token']); + OrderCloudSDK.SetToken(data.access_token); + if (vm.rememberStatus) OrderCloudSDK.SetRefreshToken(data['refresh_token']); var roles = ocRolesService.Set(data.access_token); if (roles.length == 1 && roles[0] == 'PasswordReset') { vm.token = data.access_token; @@ -46,17 +45,17 @@ function LoginController($state, $stateParams, $exceptionHandler, OrderCloud, sd }; vm.resetPasswordByToken = function() { - vm.loading = sdkOrderCloud.Me.ResetPasswordByToken({NewPassword:vm.credentials.NewPassword}) + vm.loading = OrderCloudSDK.Me.ResetPasswordByToken({NewPassword:vm.credentials.NewPassword}) .then(function(data) { vm.setForm('resetSuccess'); vm.credentials = { Username:null, Password:null - } + }; }) .catch(function(ex) { $exceptionHandler(ex); - }) + }); }; vm.resetPassword = function() { diff --git a/src/app/login/js/login.service.js b/src/app/login/js/login.service.js index ff87c865..e879e581 100644 --- a/src/app/login/js/login.service.js +++ b/src/app/login/js/login.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('LoginService', LoginService) ; -function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrderCloud, ocRolesService, clientid, buyerid, anonymous, scope) { +function LoginService($q, $window, $state, $cookies, toastr, OrderCloudSDK, ocRolesService, clientid, buyerid, anonymous, scope) { return { SendVerificationCode: _sendVerificationCode, ResetPassword: _resetPassword, @@ -20,7 +20,7 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrde URL: encodeURIComponent($window.location.href) + '{0}' }; - sdkOrderCloud.PasswordResets.SendVerificationCode(passwordResetRequest) + OrderCloudSDK.PasswordResets.SendVerificationCode(passwordResetRequest) .then(function() { deferred.resolve(); }) @@ -40,7 +40,7 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrde Password: resetPasswordCredentials.NewPassword }; - sdkOrderCloud.PasswordResets.ResetPassword(verificationCode, passwordReset) + OrderCloudSDK.PasswordResets.ResetPassword(verificationCode, passwordReset) .then(function() { deferred.resolve(); }) @@ -52,10 +52,9 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrde } function _authAnonymous() { - return OrderCloud.Auth.GetToken('') + return OrderCloudSDK.Auth.Login('') .then(function(data) { - OrderCloud.BuyerID.Set(buyerid); - OrderCloud.Auth.SetToken(data.access_token); + OrderCloudSDK.SetToken(data.access_token); $state.go('home'); }); } @@ -69,14 +68,12 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloud, sdkOrde } function _rememberMe() { - var availableRefreshToken = sdkOrderCloud.GetRefreshToken() || null; + var availableRefreshToken = OrderCloudSDK.GetRefreshToken() || null; if (availableRefreshToken) { - sdkOrderCloud.Auth.RefreshToken(availableRefreshToken, clientid, scope) + OrderCloudSDK.Auth.RefreshToken(availableRefreshToken, clientid, scope) .then(function(data) { - sdkOrderCloud.Auth.SetToken(data.access_token); - OrderCloud.BuyerID.Set(buyerid); - OrderCloud.Auth.SetToken(data.access_token); + OrderCloudSDK.SetToken(data.access_token); $state.go('home'); }) .catch(function () { diff --git a/src/app/myAddresses/js/myAddresses.config.js b/src/app/myAddresses/js/myAddresses.config.js index d5849076..b8bce645 100644 --- a/src/app/myAddresses/js/myAddresses.config.js +++ b/src/app/myAddresses/js/myAddresses.config.js @@ -11,14 +11,14 @@ function MyAddressesConfig($stateProvider) { controller: 'MyAddressesCtrl', controllerAs: 'myAddresses', data: { - pageTitle: "Personal Addresses" + pageTitle: 'Personal Addresses' }, resolve: { - AddressList: function(sdkOrderCloud) { + AddressList: function(OrderCloudSDK) { var options = { filters: {Editable: true} }; - return sdkOrderCloud.Me.ListAddresses(options); + return OrderCloudSDK.Me.ListAddresses(options); } } }); diff --git a/src/app/myAddresses/js/myAddresses.controller.js b/src/app/myAddresses/js/myAddresses.controller.js index 0c892550..03113642 100644 --- a/src/app/myAddresses/js/myAddresses.controller.js +++ b/src/app/myAddresses/js/myAddresses.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('MyAddressesCtrl', MyAddressesController) ; -function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, AddressList) { +function MyAddressesController(toastr, OrderCloudSDK, ocConfirm, ocMyAddresses, AddressList) { var vm = this; vm.list = AddressList; vm.create = function() { @@ -28,7 +28,7 @@ function MyAddressesController(toastr, sdkOrderCloud, ocConfirm, ocMyAddresses, confirmText: 'Delete address', type: 'delete'}) .then(function() { - vm.loading[scope.$index] = sdkOrderCloud.Me.DeleteAddress(scope.address.ID) + vm.loading[scope.$index] = OrderCloudSDK.Me.DeleteAddress(scope.address.ID) .then(function() { toastr.success(scope.AddressName + ' was deleted.'); vm.list.Items.splice(scope.$index, 1); diff --git a/src/app/myAddresses/js/myAddressesCreate.modal.controller.js b/src/app/myAddresses/js/myAddressesCreate.modal.controller.js index 1b614cf4..f5961178 100644 --- a/src/app/myAddresses/js/myAddressesCreate.modal.controller.js +++ b/src/app/myAddresses/js/myAddressesCreate.modal.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('CreateAddressModalCtrl', CreateAddressModalController) ; -function CreateAddressModalController($q, $exceptionHandler, $uibModalInstance, sdkOrderCloud, ocGeography) { +function CreateAddressModalController($q, $exceptionHandler, $uibModalInstance, OrderCloudSDK, ocGeography) { var vm = this; vm.countries = ocGeography.Countries; vm.states = ocGeography.States; @@ -22,7 +22,7 @@ function CreateAddressModalController($q, $exceptionHandler, $uibModalInstance, vm.loading = { message:'Creating Address' }; - vm.loading.promise = sdkOrderCloud.Me.CreateAddress(vm.address) + vm.loading.promise = OrderCloudSDK.Me.CreateAddress(vm.address) .then(function(address) { $uibModalInstance.close(address); }) diff --git a/src/app/myAddresses/js/myAddressesEdit.modal.controller.js b/src/app/myAddresses/js/myAddressesEdit.modal.controller.js index bcaa0dd3..b0ca3a2d 100644 --- a/src/app/myAddresses/js/myAddressesEdit.modal.controller.js +++ b/src/app/myAddresses/js/myAddressesEdit.modal.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('EditAddressModalCtrl', EditAddressModalController) ; -function EditAddressModalController($exceptionHandler, $uibModalInstance, sdkOrderCloud, ocGeography, SelectedAddress) { +function EditAddressModalController($exceptionHandler, $uibModalInstance, OrderCloudSDK, ocGeography, SelectedAddress) { var vm = this; vm.countries = ocGeography.Countries; vm.states = ocGeography.States; @@ -21,7 +21,7 @@ function EditAddressModalController($exceptionHandler, $uibModalInstance, sdkOrd vm.loading = { message:'Saving Address' }; - vm.loading.promise = sdkOrderCloud.Me.UpdateAddress(vm.addressID, vm.address) + vm.loading.promise = OrderCloudSDK.Me.UpdateAddress(vm.addressID, vm.address) .then(function(address) { $uibModalInstance.close(address); }) diff --git a/src/app/myOrders/approvals/js/approvals.config.js b/src/app/myOrders/approvals/js/approvals.config.js index 1b30243c..c63a6c99 100644 --- a/src/app/myOrders/approvals/js/approvals.config.js +++ b/src/app/myOrders/approvals/js/approvals.config.js @@ -16,12 +16,12 @@ function ApprovalsConfig($stateProvider){ OrderApprovals: function($stateParams, ocApprovals) { return ocApprovals.List($stateParams.orderid, $stateParams.buyerid, 1, 100); }, - CanApprove: function(CurrentUser, $stateParams, sdkOrderCloud){ + CanApprove: function(CurrentUser, $stateParams, OrderCloudSDK){ var parameters = { page: 1, pageSize: 100 }; - return sdkOrderCloud.Orders.ListEligibleApprovers('outgoing', $stateParams.orderid, parameters) + return OrderCloudSDK.Orders.ListEligibleApprovers('outgoing', $stateParams.orderid, parameters) .then(function(userList){ var userIDs = _.pluck(userList.Items, 'ID'); return userIDs.indexOf(CurrentUser.ID) > -1; diff --git a/src/app/myOrders/approvals/js/approvals.controller.js b/src/app/myOrders/approvals/js/approvals.controller.js index 43bf9047..ef017aa6 100644 --- a/src/app/myOrders/approvals/js/approvals.controller.js +++ b/src/app/myOrders/approvals/js/approvals.controller.js @@ -3,7 +3,7 @@ angular.module('orderCloud') .controller('ApprovalModalCtrl', ApprovalModalController) ; -function OrderApprovalsController($stateParams, OrderCloud, ocApprovals, OrderApprovals, CanApprove) { +function OrderApprovalsController($stateParams, ocApprovals, OrderApprovals, CanApprove) { var vm = this; vm.list = OrderApprovals; vm.canApprove = CanApprove; @@ -30,7 +30,7 @@ function OrderApprovalsController($stateParams, OrderCloud, ocApprovals, OrderAp }; } -function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalInstance, sdkOrderCloud, toastr){ +function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalInstance, OrderCloudSDK, toastr){ var vm = this; vm.intent = Intent; // 'Approve' or 'Decline' vm.orderid = OrderID; @@ -44,7 +44,7 @@ function ApprovalModalController(OrderID, Intent, $exceptionHandler, $uibModalIn } function submit(){ - return sdkOrderCloud.Orders[vm.intent]('outgoing', vm.orderid, {comments: vm.comments}) + return OrderCloudSDK.Orders[vm.intent]('outgoing', vm.orderid, {comments: vm.comments}) .then(function(){ toastr.success('Order ' + vm.intent.toLowerCase() + 'd'); $uibModalInstance.close(); diff --git a/src/app/myOrders/approvals/js/approvals.service.js b/src/app/myOrders/approvals/js/approvals.service.js index f637acec..ac91ea66 100644 --- a/src/app/myOrders/approvals/js/approvals.service.js +++ b/src/app/myOrders/approvals/js/approvals.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocApprovals', ocApprovals) ; -function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ +function ocApprovals($q, $uibModal, $state, OrderCloudSDK){ var service = { List: _list, UpdateApprovalStatus: _updateApprovalStatus @@ -16,9 +16,9 @@ function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ pageSize: pageSize, sortBy: 'Status' }; - sdkOrderCloud.Orders.ListApprovals('outgoing', orderID, options) + OrderCloudSDK.Orders.ListApprovals('outgoing', orderID, options) .then(function(data) { - getApprovingUserGroups(data) + getApprovingUserGroups(data); }); function getApprovingUserGroups(data) { @@ -28,7 +28,7 @@ function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ pageSize: 100, filters: {ID: userGroupIDs.join('|')} }; - sdkOrderCloud.UserGroups.List(buyerID, options) + OrderCloudSDK.UserGroups.List(buyerID, options) .then(function(userGroupList) { _.each(data.Items, function(approval) { approval.ApprovingUserGroup = _.findWhere(userGroupList.Items, {ID: approval.ApprovingGroupID}); @@ -47,7 +47,7 @@ function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ pageSize: 100, filters: {ID: userIDs.join('|')} }; - sdkOrderCloud.Users.List(buyerID, options) + OrderCloudSDK.Users.List(buyerID, options) .then(function(userList){ _.each(data.Items, function(approval){ if(approval.Status !== 'Pending') approval.ApprovingUser = _.findWhere(userList.Items, {ID: approval.ApproverID}); @@ -66,7 +66,7 @@ function ocApprovals($q, $uibModal, $state, sdkOrderCloud){ pageSize: 100, filters: {ID: approvalRuleIDs.join('|')} }; - sdkOrderCloud.ApprovalRules.List(buyerID, options) + OrderCloudSDK.ApprovalRules.List(buyerID, options) .then(function(approvalRuleData) { angular.forEach(data.Items, function(approval) { approval.ApprovalRule = _.findWhere(approvalRuleData.Items, {ID: approval.ApprovalRuleID}); diff --git a/src/app/myOrders/order/js/orderDetails.config.js b/src/app/myOrders/order/js/orderDetails.config.js index 37336a70..3c58d938 100644 --- a/src/app/myOrders/order/js/orderDetails.config.js +++ b/src/app/myOrders/order/js/orderDetails.config.js @@ -17,8 +17,8 @@ function OrderDetailConfig($stateProvider){ SelectedOrder: function($stateParams, ocOrderDetails){ return ocOrderDetails.Get($stateParams.orderid); }, - OrderLineItems: function($stateParams, sdkOrderCloud){ - return sdkOrderCloud.LineItems.List('outgoing', $stateParams.orderid); + OrderLineItems: function($stateParams, OrderCloudSDK){ + return OrderCloudSDK.LineItems.List('outgoing', $stateParams.orderid); } } }); diff --git a/src/app/myOrders/order/js/orderDetails.controller.js b/src/app/myOrders/order/js/orderDetails.controller.js index 38caf293..6e88ba37 100644 --- a/src/app/myOrders/order/js/orderDetails.controller.js +++ b/src/app/myOrders/order/js/orderDetails.controller.js @@ -2,21 +2,28 @@ angular.module('orderCloud') .controller('OrderDetailsCtrl', OrderDetailsController) ; -function OrderDetailsController($stateParams, OrderCloud, SelectedOrder, OrderLineItems) { +function OrderDetailsController($stateParams, OrderCloudSDK, SelectedOrder, OrderLineItems) { var vm = this; vm.order = SelectedOrder; vm.lineItems = OrderLineItems; vm.pageChanged = function() { - return OrderCloud.LineItems.List($stateParams.orderid, null, vm.lineItems.Meta.Page, vm.lineItems.Meta.PageSize, null, null, null, $stateParams.buyerid) + var options = { + page: vm.lineItems.Meta.Page, + pageSize: vm.lineItems.Meta.PageSize + }; + return OrderCloudSDK.LineItems.List('outgoing', $stateParams.orderid, options) .then(function(data) { vm.lineItems = data; }); }; vm.loadMore = function() { - vm.lineItems.Meta.Page++; - return OrderCloud.LineItems.List($stateParams.orderid, null, vm.lineItems.Meta.Page, vm.lineItems.Meta.PageSize, null, null, null, $stateParams.buyerid) + var options = { + page: vm.lineItems.Meta.Page++, + pageSize: vm.lineItems.Meta.PageSize + }; + return OrderCloudSDK.LineItems.List('outgoing', $stateParams.orderid, options) .then(function(data) { vm.lineItems.Items = vm.lineItems.Items.concat(data.Items); vm.lineItem.Meta = data.Meta; diff --git a/src/app/myOrders/order/js/orderDetails.service.js b/src/app/myOrders/order/js/orderDetails.service.js index c0848de1..d24349bc 100644 --- a/src/app/myOrders/order/js/orderDetails.service.js +++ b/src/app/myOrders/order/js/orderDetails.service.js @@ -2,19 +2,19 @@ angular.module('orderCloud') .factory('ocOrderDetails', ocOrderDetailsService) ; -function ocOrderDetailsService($q, $exceptionHandler, sdkOrderCloud){ +function ocOrderDetailsService($q, $exceptionHandler, OrderCloudSDK){ var service = { Get: _get }; function _get(orderID){ - return sdkOrderCloud.Orders.Get('outgoing', orderID) + return OrderCloudSDK.Orders.Get('outgoing', orderID) .then(function(order){ return getBuyerOrg(order); }); function getBuyerOrg(order){ - return sdkOrderCloud.Buyers.Get(order.FromCompanyID) + return OrderCloudSDK.Buyers.Get(order.FromCompanyID) .then(function(buyer){ order.FromCompany = buyer; return order; diff --git a/src/app/myOrders/orders/js/orders.controller.js b/src/app/myOrders/orders/js/orders.controller.js index 232538c9..75495374 100644 --- a/src/app/myOrders/orders/js/orders.controller.js +++ b/src/app/myOrders/orders/js/orders.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('OrdersCtrl', OrdersController) ; -function OrdersController($state, $filter, $ocMedia, sdkOrderCloud, ocParameters, ocOrders, OrderList, Parameters) { +function OrdersController($state, $filter, $ocMedia, OrderCloudSDK, ocParameters, ocOrders, OrderList, Parameters) { var vm = this; vm.list = OrderList; if (Parameters.fromDate) Parameters.fromDate = new Date(Parameters.fromDate); diff --git a/src/app/myOrders/orders/js/orders.service.js b/src/app/myOrders/orders/js/orders.service.js index 1b64b04f..682a0c22 100644 --- a/src/app/myOrders/orders/js/orders.service.js +++ b/src/app/myOrders/orders/js/orders.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrders', ocOrdersService) ; -function ocOrdersService($filter, sdkOrderCloud){ +function ocOrdersService($filter, OrderCloudSDK){ var service = { List: _list }; @@ -43,9 +43,9 @@ function ocOrdersService($filter, sdkOrderCloud){ parameters.pageSize = parameters.pageSize ? parameters.pageSize : 12; if (parameters.tab == 'approvals') { - return sdkOrderCloud.Me.ListApprovableOrders(parameters); + return OrderCloudSDK.Me.ListApprovableOrders(parameters); } else { - return sdkOrderCloud.Me.ListOrders(parameters); + return OrderCloudSDK.Me.ListOrders(parameters); } } diff --git a/src/app/myOrders/shipments/js/orderShipments.service.js b/src/app/myOrders/shipments/js/orderShipments.service.js index d6b8b5d7..d2e2492a 100644 --- a/src/app/myOrders/shipments/js/orderShipments.service.js +++ b/src/app/myOrders/shipments/js/orderShipments.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrderShipments', OrderCloudOrderShipmentsService) ; -function OrderCloudOrderShipmentsService($q, sdkOrderCloud) { +function OrderCloudOrderShipmentsService($q, OrderCloudSDK) { var service = { List: _list }; @@ -15,7 +15,7 @@ function OrderCloudOrderShipmentsService($q, sdkOrderCloud) { page: page, pageSize: pageSize }; - sdkOrderCloud.Me.ListShipments(options) + OrderCloudSDK.Me.ListShipments(options) .then(function(data) { df.resolve(data); //TODO: Add this back if Shopper is able to list shipment items @@ -29,7 +29,7 @@ function OrderCloudOrderShipmentsService($q, sdkOrderCloud) { queue.push((function() { var d = $q.defer(); - sdkOrderCloud.Shipments.ListItems(shipment.ID) + OrderCloudSDK.Shipments.ListItems(shipment.ID) .then(function(shipmentItems) { shipment.Items = shipmentItems.Items; d.resolve(); @@ -51,7 +51,7 @@ function OrderCloudOrderShipmentsService($q, sdkOrderCloud) { pageSize: 100, filters: {ID: lineItemIDs.join('|')} }; - sdkOrderCloud.LineItems.List('incoming', orderID, options) + OrderCloudSDK.LineItems.List('incoming', orderID, options) .then(function(lineItemData) { angular.forEach(data.Items, function(shipment) { angular.forEach(shipment.Items, function(shipmentItem) { diff --git a/src/app/myPayments/js/myPayments.config.js b/src/app/myPayments/js/myPayments.config.js index b394865f..e0452722 100644 --- a/src/app/myPayments/js/myPayments.config.js +++ b/src/app/myPayments/js/myPayments.config.js @@ -11,26 +11,26 @@ function MyPaymentsConfig($stateProvider) { controller: 'MyPaymentsCtrl', controllerAs: 'myPayments', data: { - pageTitle: "Payment Methods" + pageTitle: 'Payment Methods' }, resolve: { - UserCreditCards: function(sdkOrderCloud) { + UserCreditCards: function(OrderCloudSDK) { var options = { filters: {Editable: true} }; - return sdkOrderCloud.Me.ListCreditCards(options); + return OrderCloudSDK.Me.ListCreditCards(options); }, - UserSpendingAccounts: function(sdkOrderCloud) { + UserSpendingAccounts: function(OrderCloudSDK) { var options = { filters: {RedemptionCode: '!*'} }; - return sdkOrderCloud.Me.ListSpendingAccounts(options); + return OrderCloudSDK.Me.ListSpendingAccounts(options); }, - GiftCards: function(sdkOrderCloud) { + GiftCards: function(OrderCloudSDK) { var options = { filters: {RedemptionCode: '*'} }; - return sdkOrderCloud.Me.ListSpendingAccounts(options); + return OrderCloudSDK.Me.ListSpendingAccounts(options); } } }); diff --git a/src/app/productBrowse/js/productBrowse.config.js b/src/app/productBrowse/js/productBrowse.config.js index 5f493ffe..5c45f720 100644 --- a/src/app/productBrowse/js/productBrowse.config.js +++ b/src/app/productBrowse/js/productBrowse.config.js @@ -19,14 +19,14 @@ function ProductBrowseConfig($urlRouterProvider, $stateProvider) { Parameters: function ($stateParams, ocParameters) { return ocParameters.Get($stateParams); }, - CategoryList: function(sdkOrderCloud, catalogid) { + CategoryList: function(OrderCloudSDK, catalogid) { var parameters = { depth: 'all', catalogID: catalogid, page: 1, pageSize: 100 }; - return sdkOrderCloud.Me.ListCategories(parameters); + return OrderCloudSDK.Me.ListCategories(parameters); }, CategoryTree: function(CategoryList) { var result = []; @@ -58,14 +58,14 @@ function ProductBrowseConfig($urlRouterProvider, $stateProvider) { Parameters: function ($stateParams, ocParameters) { return ocParameters.Get($stateParams); }, - ProductList: function(sdkOrderCloud, CurrentUser, Parameters, catalogid) { + ProductList: function(OrderCloudSDK, CurrentUser, Parameters, catalogid) { if (Parameters.favorites && CurrentUser.xp.FavoriteProducts) { Parameters.filters ? angular.extend(Parameters.filters, Parameters.filters, {ID:CurrentUser.xp.FavoriteProducts.join('|')}) : Parameters.filters = {ID:CurrentUser.xp.FavoriteProducts.join('|')}; } else if (Parameters.filters) { delete Parameters.filters.ID; } var parameters = angular.extend(Parameters, {catalogID: catalogid, categoryID: Parameters.categoryid, depth: 'all'}); - return sdkOrderCloud.Me.ListProducts(parameters); + return OrderCloudSDK.Me.ListProducts(parameters); } } }); diff --git a/src/app/productBrowse/js/productBrowseProductView.controller.js b/src/app/productBrowse/js/productBrowseProductView.controller.js index b1afa913..2ebcf39d 100644 --- a/src/app/productBrowse/js/productBrowseProductView.controller.js +++ b/src/app/productBrowse/js/productBrowseProductView.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('ProductViewCtrl', ProductViewController) ; -function ProductViewController($state, $ocMedia, ocParameters, sdkOrderCloud, CurrentOrder, ProductList, CategoryList, Parameters){ +function ProductViewController($state, $ocMedia, ocParameters, OrderCloudSDK, CurrentOrder, ProductList, CategoryList, Parameters){ var vm = this; vm.parameters = Parameters; vm.categories = CategoryList; @@ -58,7 +58,7 @@ function ProductViewController($state, $ocMedia, ocParameters, sdkOrderCloud, Cu //load the next page of results with all the same parameters vm.loadMore = function() { var parameters = angular.extend(Parameters, {page: vm.list.Meta.Page + 1}); - return sdkOrderCloud.Me.ListProducts(parameters) + return OrderCloudSDK.Me.ListProducts(parameters) .then(function(data) { vm.list.Items = vm.list.Items.concat(data.Items); vm.list.Meta = data.Meta; diff --git a/src/app/productDetail/js/productDetail.config.js b/src/app/productDetail/js/productDetail.config.js index c4d4b215..1a37c0df 100644 --- a/src/app/productDetail/js/productDetail.config.js +++ b/src/app/productDetail/js/productDetail.config.js @@ -11,8 +11,8 @@ function ProductDetailConfig($stateProvider) { controller: 'ProductDetailCtrl', controllerAs: 'productDetail', resolve: { - Product: function ($stateParams, sdkOrderCloud, catalogid) { - return sdkOrderCloud.Me.GetProduct(catalogid, $stateParams.productid); + Product: function ($stateParams, OrderCloudSDK, catalogid) { + return OrderCloudSDK.Me.GetProduct(catalogid, $stateParams.productid); } } }); diff --git a/src/app/productDetail/js/specForm.directive.js b/src/app/productDetail/js/specForm.directive.js index 867b19c7..a8a14272 100644 --- a/src/app/productDetail/js/specForm.directive.js +++ b/src/app/productDetail/js/specForm.directive.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .directive('ocSpecForm', OrderCloudSpecFormDirective) ; -function OrderCloudSpecFormDirective(sdkOrderCloud, catalogid) { +function OrderCloudSpecFormDirective(OrderCloudSDK, catalogid) { return { scope: { product: '=' @@ -15,7 +15,7 @@ function OrderCloudSpecFormDirective(sdkOrderCloud, catalogid) { page: 1, pageSize: 100 }; - sdkOrderCloud.Me.ListSpecs(catalogid, scope.product.ID, options) + OrderCloudSDK.Me.ListSpecs(catalogid, scope.product.ID, options) .then(function(data){ //go through specs array if there is a default value, set the specValue = default value angular.forEach(data.Items, function(obj, key){ @@ -27,5 +27,5 @@ function OrderCloudSpecFormDirective(sdkOrderCloud, catalogid) { return null; } } - } + }; } \ No newline at end of file diff --git a/src/app/productSearch/js/productSearch.component.js b/src/app/productSearch/js/productSearch.component.js index 247d6e50..6c651f9e 100644 --- a/src/app/productSearch/js/productSearch.component.js +++ b/src/app/productSearch/js/productSearch.component.js @@ -14,7 +14,7 @@ function OrderCloudProductSearchComponent() { }; } -function ProductSearchComponentController($state, sdkOrderCloud, catalogid) { +function ProductSearchComponentController($state, OrderCloudSDK, catalogid) { var vm = this; vm.getSearchResults = function() { @@ -25,7 +25,7 @@ function ProductSearchComponentController($state, sdkOrderCloud, catalogid) { pageSize: vm.maxProducts || 5, depth: 'all' }; - return sdkOrderCloud.Me.ListProducts(parameters) + return OrderCloudSDK.Me.ListProducts(parameters) .then(function(data) { return data.Items; }); diff --git a/src/app/productSearch/js/productSearch.config.js b/src/app/productSearch/js/productSearch.config.js index df73ab61..737a98cd 100644 --- a/src/app/productSearch/js/productSearch.config.js +++ b/src/app/productSearch/js/productSearch.config.js @@ -14,9 +14,9 @@ function ProductSearchConfig($stateProvider) { Parameters: function(ocParameters, $stateParams) { return ocParameters.Get($stateParams); }, - ProductList: function(sdkOrderCloud, Parameters, catalogid) { + ProductList: function(OrderCloudSDK, Parameters, catalogid) { var parameters = angular.extend(Parameters, {catalogID: catalogid, depth: 'all', pageSize: (Parameters.pageSize || 12)}); - return sdkOrderCloud.Me.ListProducts(parameters); + return OrderCloudSDK.Me.ListProducts(parameters); } } }); diff --git a/src/app/productSearch/js/productSearch.controller.js b/src/app/productSearch/js/productSearch.controller.js index c7b02e17..889a039c 100644 --- a/src/app/productSearch/js/productSearch.controller.js +++ b/src/app/productSearch/js/productSearch.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('ProductSearchCtrl', ProductSearchController) ; -function ProductSearchController($state, sdkOrderCloud, ocParameters, Parameters, ProductList) { +function ProductSearchController($state, OrderCloudSDK, ocParameters, Parameters, ProductList) { var vm = this; vm.list = ProductList; vm.parameters = Parameters; @@ -39,8 +39,8 @@ function ProductSearchController($state, sdkOrderCloud, ocParameters, Parameters }; vm.loadMore = function() { - var parameters = angular.extend(Parameters, {page:vm.list.Meta.Page + 1}) - return sdkOrderCloud.Me.ListProducts(parameters) + 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; diff --git a/src/app/productSearch/js/productSearch.modal.controller.js b/src/app/productSearch/js/productSearch.modal.controller.js index 42a48424..964473c4 100644 --- a/src/app/productSearch/js/productSearch.modal.controller.js +++ b/src/app/productSearch/js/productSearch.modal.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('ProductSearchModalCtrl', ProductSearchModalController) ; -function ProductSearchModalController($uibModalInstance, $scope, sdkOrderCloud, catalogid) { +function ProductSearchModalController($uibModalInstance, $scope, OrderCloudSDK, catalogid) { var vm = this; vm.getSearchResults = function() { @@ -13,7 +13,7 @@ function ProductSearchModalController($uibModalInstance, $scope, sdkOrderCloud, pageSize: vm.maxProducts || 5, depth: 'all' }; - return sdkOrderCloud.Me.ListProducts(parameters) + return OrderCloudSDK.Me.ListProducts(parameters) .then(function(data) { return data.Items; }); diff --git a/src/app/repeatOrder/js/repeatOrder.service.js b/src/app/repeatOrder/js/repeatOrder.service.js index 76ec0a82..4b536313 100644 --- a/src/app/repeatOrder/js/repeatOrder.service.js +++ b/src/app/repeatOrder/js/repeatOrder.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocRepeatOrder', OrderCloudRepeatOrderService) ; -function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, sdkOrderCloud, ocLineItems, catalogid) { +function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, OrderCloudSDK, ocLineItems, catalogid) { return { GetValidLineItems: getValidLineItems, AddLineItemsToCart: addLineItemsToCart @@ -35,7 +35,7 @@ function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, pageSize: 100, depth: 'all' }; - sdkOrderCloud.Me.ListProducts(options) + OrderCloudSDK.Me.ListProducts(options) .then(function(data) { var productList = data; if (data.Meta.TotalPages > data.Meta.Page) { @@ -43,7 +43,7 @@ function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, while (page < data.Meta.TotalPages) { page++; options.page = page; - queue.push(sdkOrderCloud.Me.ListProducts(options)); + queue.push(OrderCloudSDK.Me.ListProducts(options)); } } $q.all(queue) @@ -70,7 +70,7 @@ function OrderCloudRepeatOrderService($q, $rootScope, toastr, $exceptionHandler, Quantity: li.Quantity, Specs: li.Specs }; - queue.push(sdkOrderCloud.LineItems.Create('outgoing', orderID, lineItemToAdd)); + queue.push(OrderCloudSDK.LineItems.Create('outgoing', orderID, lineItemToAdd)); }); $q.all(queue) .then(function(){ From 563a512fdbd258e235aba098098bb88c2e3e34a9 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 14 Apr 2017 09:11:27 -0500 Subject: [PATCH 097/158] Replacing old sdk with new on My Payments --- src/app/myOrders/payments/js/orderPayments.service.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/myOrders/payments/js/orderPayments.service.js b/src/app/myOrders/payments/js/orderPayments.service.js index b355904c..9385b6fc 100644 --- a/src/app/myOrders/payments/js/orderPayments.service.js +++ b/src/app/myOrders/payments/js/orderPayments.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('ocOrderPayments', OrderCloudOrderPaymentsService) ; -function OrderCloudOrderPaymentsService($q, sdkOrderCloud) { +function OrderCloudOrderPaymentsService($q, OrderCloudSDK) { var service = { List: _list }; @@ -14,7 +14,7 @@ function OrderCloudOrderPaymentsService($q, sdkOrderCloud) { page: page, pageSize: pageSize }; - sdkOrderCloud.Payments.List('outgoing', orderID, options) + OrderCloudSDK.Payments.List('outgoing', orderID, options) .then(function(data) { getPaymentDetails(data); }); @@ -28,7 +28,7 @@ function OrderCloudOrderPaymentsService($q, sdkOrderCloud) { payment.Details = null; if (payment.Type == 'SpendingAccount') { - sdkOrderCloud.Me.GetSpendingAccount(payment.SpendingAccountID) + OrderCloudSDK.Me.GetSpendingAccount(payment.SpendingAccountID) .then(function(spendingAccount) { payment.Details = spendingAccount; d.resolve(); @@ -38,7 +38,7 @@ function OrderCloudOrderPaymentsService($q, sdkOrderCloud) { }); } else if (payment.Type == 'CreditCard') { - sdkOrderCloud.Me.GetCreditCard(payment.CreditCardID) + OrderCloudSDK.Me.GetCreditCard(payment.CreditCardID) .then(function(creditCard) { payment.Details = creditCard; d.resolve(); From 284c4eb50b878b8cb9bc495a03db97575c8ab598 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 14 Apr 2017 10:26:33 -0500 Subject: [PATCH 098/158] Update to new SDK version. Update My Orders Shipments to list Shipment Items. --- bower.json | 2 +- .../shipments/js/orderShipments.config.js | 4 +-- .../shipments/js/orderShipments.service.js | 31 +++++++------------ 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/bower.json b/bower.json index 15f9bb0c..318c6326 100644 --- a/bower.json +++ b/bower.json @@ -45,7 +45,7 @@ "jasny-bootstrap": "3.1.3", "angular-payments": "*", "bootswatch": "^3.3.7", - "ordercloud-angular-sdk": "v1.0.45-staging-prerelease" + "ordercloud-angular-sdk": "v1.0.46-staging-prerelease" }, "devDependencies": { "angular-mocks": "^1.6.0" diff --git a/src/app/myOrders/shipments/js/orderShipments.config.js b/src/app/myOrders/shipments/js/orderShipments.config.js index 69d248e7..d676ebfd 100644 --- a/src/app/myOrders/shipments/js/orderShipments.config.js +++ b/src/app/myOrders/shipments/js/orderShipments.config.js @@ -13,8 +13,8 @@ function OrderShipmentsConfig($stateProvider) { pageTitle: 'Order Shipments' }, resolve: { - OrderShipments: function($stateParams, ocOrderShipments) { - return ocOrderShipments.List($stateParams.orderid); + OrderShipments: function($stateParams, ocOrderShipments, OrderLineItems) { + return ocOrderShipments.List($stateParams.orderid, 1, 100, OrderLineItems); } } }) diff --git a/src/app/myOrders/shipments/js/orderShipments.service.js b/src/app/myOrders/shipments/js/orderShipments.service.js index d2e2492a..f594b6c0 100644 --- a/src/app/myOrders/shipments/js/orderShipments.service.js +++ b/src/app/myOrders/shipments/js/orderShipments.service.js @@ -7,9 +7,11 @@ function OrderCloudOrderShipmentsService($q, OrderCloudSDK) { List: _list }; - function _list(orderID, page, pageSize) { + function _list(orderID, page, pageSize, OrderLineItems) { var df = $q.defer(); + console.log(OrderLineItems); + var options = { orderID: orderID, page: page, @@ -17,9 +19,7 @@ function OrderCloudOrderShipmentsService($q, OrderCloudSDK) { }; OrderCloudSDK.Me.ListShipments(options) .then(function(data) { - df.resolve(data); - //TODO: Add this back if Shopper is able to list shipment items - //getShipmentItems(data); + getShipmentItems(data); }); function getShipmentItems(data) { @@ -29,7 +29,7 @@ function OrderCloudOrderShipmentsService($q, OrderCloudSDK) { queue.push((function() { var d = $q.defer(); - OrderCloudSDK.Shipments.ListItems(shipment.ID) + OrderCloudSDK.Me.ListShipmentItems(shipment.ID) .then(function(shipmentItems) { shipment.Items = shipmentItems.Items; d.resolve(); @@ -45,22 +45,13 @@ function OrderCloudOrderShipmentsService($q, OrderCloudSDK) { } function getLineItems(data) { - var lineItemIDs = _.uniq(_.flatten(_.map(data.Items, function(shipment) { return _.pluck(shipment.Items, 'LineItemID');}))); - var options = { - page: 1, - pageSize: 100, - filters: {ID: lineItemIDs.join('|')} - }; - OrderCloudSDK.LineItems.List('incoming', orderID, options) - .then(function(lineItemData) { - angular.forEach(data.Items, function(shipment) { - angular.forEach(shipment.Items, function(shipmentItem) { - shipmentItem.LineItem = _.findWhere(lineItemData.Items, {ID: shipmentItem.LineItemID}); - }); - }); - - analyzeShippingAddresses(data); + angular.forEach(data.Items, function(shipment) { + angular.forEach(shipment.Items, function(shipmentItem) { + shipmentItem.LineItem = _.findWhere(OrderLineItems.Items, {ID: shipmentItem.LineItemID}); }); + }); + + analyzeShippingAddresses(data); } function analyzeShippingAddresses(data) { From e9799bc5107297719a7c3c26ff85464c4e691bd3 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 14 Apr 2017 10:29:04 -0500 Subject: [PATCH 099/158] Adding OrderLineItems to controller calls to list ShipmentItems --- src/app/myOrders/shipments/js/orderShipments.controller.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/myOrders/shipments/js/orderShipments.controller.js b/src/app/myOrders/shipments/js/orderShipments.controller.js index 57d23b72..1ff7a661 100644 --- a/src/app/myOrders/shipments/js/orderShipments.controller.js +++ b/src/app/myOrders/shipments/js/orderShipments.controller.js @@ -2,13 +2,13 @@ angular.module('orderCloud') .controller('OrderShipmentsCtrl', OrderShipmentsController) ; -function OrderShipmentsController($stateParams, OrderShipments) { +function OrderShipmentsController($stateParams, OrderShipments, OrderLineItems) { var vm = this; vm.list = OrderShipments; vm.orderID = $stateParams.orderid; vm.pageChanged = function() { - ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize) + ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize, OrderLineItems) .then(function(data) { vm.list = data; }); @@ -16,7 +16,7 @@ function OrderShipmentsController($stateParams, OrderShipments) { vm.loadMore = function() { vm.list.Meta.Page++; - ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize) + ocOrderShipmentsService.List($stateParams.orderid, vm.list.Meta.Page, vm.list.Meta.PageSize, OrderLineItems) .then(function(data) { vm.list.Items = vm.list.Items.concat(data.Items); vm.list.Meta = data.Meta; From 8e52462fd29912db70d87853cf694cd3998cc89c Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 14 Apr 2017 11:07:15 -0500 Subject: [PATCH 100/158] Create links for shipment tracking numbers --- .../oc-shipment-tracking.js | 36 +++++++++++++++++++ .../shipments/templates/orderShipments.html | 7 ++-- 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 src/app/common/filters/oc-shipment-tracking/oc-shipment-tracking.js diff --git a/src/app/common/filters/oc-shipment-tracking/oc-shipment-tracking.js b/src/app/common/filters/oc-shipment-tracking/oc-shipment-tracking.js new file mode 100644 index 00000000..9a01faec --- /dev/null +++ b/src/app/common/filters/oc-shipment-tracking/oc-shipment-tracking.js @@ -0,0 +1,36 @@ +angular.module('orderCloud') + .filter('ocShipmentTracking', OrderCloudShipmentTrackingFilter) + .filter('ocShipperTrackingSupported', OrderCloudShipperTrackingSupportedFilter) +; + +function OrderCloudShipmentTrackingFilter() { + return function(trackingNumber, shipper) { + if (!trackingNumber || !shipper) return; + + switch(shipper.toLowerCase()) { + case 'ups': + return 'https://wwwapps.ups.com/WebTracking/track?track=yes&trackNums=' + trackingNumber; + break; + case 'usps': + return 'https://tools.usps.com/go/TrackConfirmAction?tLabels=' + trackingNumber; + break; + case 'fedex': + return 'https://www.fedex.com/apps/fedextrack/?tracknumbers=' + trackingNumber; + break; + } + } +} + +function OrderCloudShipperTrackingSupportedFilter() { + return function(shipper) { + if (!shipper) return false; + + var supportedShippers = [ + 'ups', + 'usps', + 'fedex' + ]; + + return supportedShippers.indexOf(shipper.toLowerCase()) > -1; + } +} \ No newline at end of file diff --git a/src/app/myOrders/shipments/templates/orderShipments.html b/src/app/myOrders/shipments/templates/orderShipments.html index c166f4d6..ad4f25a3 100644 --- a/src/app/myOrders/shipments/templates/orderShipments.html +++ b/src/app/myOrders/shipments/templates/orderShipments.html @@ -39,8 +39,11 @@ <h3> <br> <div class="panel panel-default"> <div class="panel-body"> - <b>Shipper: </b> {{orderShipments.selectedShipment.Shipper}} <br> - <b>Tracking Number: </b> {{orderShipments.selectedShipment.TrackingNumber}} <br> + <b>Shipper: </b> {{orderShipments.selectedShipment.Shipper}} <span>{{orderShipments.selectedShipment.Shipper | ocShipperTrackingSupported}}</span><br> + <b>Tracking Number: </b> + <span ng-if="!(orderShipments.selectedShipment.Shipper | ocShipperTrackingSupported)">{{orderShipments.selectedShipment.TrackingNumber}}</span> + <a ng-if="(orderShipments.selectedShipment.Shipper | ocShipperTrackingSupported)" href="{{orderShipments.selectedShipment.TrackingNumber | ocShipmentTracking:orderShipments.selectedShipment.Shipper}}" target="_blank">{{orderShipments.selectedShipment.TrackingNumber}}</a> + <br> <b>Date Shipped: </b> {{orderShipments.selectedShipment.DateShipped | date:'shortDate'}} <br> <b>Date Delivered: </b> {{orderShipments.selectedShipment.DateDelivered | date:'shortDate'}} <br> <b>Cost: </b> {{orderShipments.selectedShipment.Cost | currency}} From 304f74907e1744d3f386f800e834975e2f152ba4 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 08:48:12 -0500 Subject: [PATCH 101/158] Create consistent layout for navmenu and navbar OC-2054 --- src/app/base/templates/base.html | 87 +++++++++++++++++--------------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/src/app/base/templates/base.html b/src/app/base/templates/base.html index 9d141d62..d8832835 100644 --- a/src/app/base/templates/base.html +++ b/src/app/base/templates/base.html @@ -1,6 +1,7 @@ <!--<header> <div ui-view="nav"></div> </header>--> +<!--Navmenu is used on smaller viewports--> <nav class="navmenu navmenu-default navmenu-fixed-left offcanvas"> <a class="navmenu-brand" ui-sref="home">{{application.name}}</a> <ul class="nav navmenu-nav"> @@ -10,24 +11,30 @@ <li> <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> </li> - <li> - <a ui-sref="account"><i class="fa fa-user"></i> <span>Account</span></a> - </li> - <li class="divider"></li> - <li ui-sref-active="active"> - <a ui-sref="myAddresses">Personal Addresses</a> - </li> - <li ui-sref-active="active"> - <a ui-sref="myPayments">Payment Methods</a> - </li> - <li ui-sref-active="active"> - <a ui-sref="favoriteProducts">Favorite Products</a> - </li> - <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> - <a ui-sref="orders({tab: 'history'})">Orders</a> - </li> - <li> - <a ng-click="application.logout()">Log out</a> + <li uib-dropdown ng-if="!base.currentUser.Anonymous"> + <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></a> + <ul class="dropdown-menu navmenu-nav" uib-dropdown-menu role="menu"> + <li> + <a ui-sref="account">My Account</a> + </li> + <li class="divider"></li> + <li ui-sref-active="active"> + <a ui-sref="myAddresses">Personal Addresses</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="myPayments">Payment Methods</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="favoriteProducts">Favorite Products</a> + </li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a ui-sref="orders({tab: 'history'})">Orders</a> + </li> + <li class="divider"></li> + <li> + <a ng-click="application.logout()">Log out</a> + </li> + </ul> </li> </ul> </nav> @@ -61,30 +68,30 @@ <a ui-sref="cart"><i class="fa fa-shopping-cart"></i> <span class="sr-only">Shopping Cart</span> <span class="badge" ng-bind="base.currentOrder.LineItemCount"></span></a> </li> </ul> - <ul class="nav navbar-nav navbar-right c-desktop-nav"> - <li class="c-desktop-nav" uib-dropdown ng-if="!base.currentUser.Anonymous"> + <ul class="nav navbar-nav navbar-right c-desktop-nav" ng-if="!base.currentUser.Anonymous"> + <li class="c-desktop-nav" uib-dropdown> <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></span></a> <ul class="dropdown-menu-right" uib-dropdown-menu> - <li> - <a ui-sref="account">My Account</a> - </li> - <li class="divider"></li> - <li ui-sref-active="active"> - <a ui-sref="myAddresses">Personal Addresses</a> - </li> - <li ui-sref-active="active"> - <a ui-sref="myPayments">Payment Methods</a> - </li> - <li ui-sref-active="active"> - <a ui-sref="favoriteProducts">Favorite Products</a> - </li> - <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> - <a ui-sref="orders({tab: 'history'})">Orders</a> - </li> - <li class="divider"></li> - <li> - <a ng-click="application.logout()">Log out</a> - </li> + <li> + <a ui-sref="account">My Account</a> + </li> + <li class="divider"></li> + <li ui-sref-active="active"> + <a ui-sref="myAddresses">Personal Addresses</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="myPayments">Payment Methods</a> + </li> + <li ui-sref-active="active"> + <a ui-sref="favoriteProducts">Favorite Products</a> + </li> + <li ng-class="{active: application.$state.includes('orders') || application.$state.includes('orderDetails')}"> + <a ui-sref="orders({tab: 'history'})">Orders</a> + </li> + <li class="divider"></li> + <li> + <a ng-click="application.logout()">Log out</a> + </li> </ul> </li> </ul> From 95ea589a440c701ab924fb9c8695a4b513dd2c3f Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 08:54:14 -0500 Subject: [PATCH 102/158] Remove styles that are no longer used OC-2054 --- src/app/styles/components/_header.less | 18 ---------- src/app/styles/components/_topnav.less | 50 -------------------------- src/app/styles/components/glob.less | 1 - 3 files changed, 69 deletions(-) delete mode 100644 src/app/styles/components/_topnav.less diff --git a/src/app/styles/components/_header.less b/src/app/styles/components/_header.less index b0b6dd57..e69de29b 100644 --- a/src/app/styles/components/_header.less +++ b/src/app/styles/components/_header.less @@ -1,18 +0,0 @@ -.c-header { - position: relative; - min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) - margin-bottom: @navbar-margin-bottom; - border: 1px solid @navbar-default-border; - //brought in from .navbar-default - background-color: @navbar-default-bg; - // Prevent floats from breaking the navbar - &:extend(.clearfix all); - &--fixed-top { - position: fixed; - right: 0; - left: 0; - top: 0; - border-width: 0 0 1px; - z-index: @zindex-navbar-fixed; - } -} diff --git a/src/app/styles/components/_topnav.less b/src/app/styles/components/_topnav.less deleted file mode 100644 index 1f0abd84..00000000 --- a/src/app/styles/components/_topnav.less +++ /dev/null @@ -1,50 +0,0 @@ -.c-topnav { - .oc-flex-layout.horizontal; - .oc-flex-layout.center; - .oc-flex-layout.wrap; - .oc-flex-layout.between-justified; - .container>& { - margin-left: -@navbar-padding-horizontal; - margin-right: -@navbar-padding-horizontal; - } - &__item { - display: inline-block; - padding: @navbar-padding-vertical @navbar-padding-horizontal; - line-height: @line-height-computed; - a { - text-decoration: none; - color: @navbar-default-link-color; - } - } - &__brand { - order: 0; - font-family: @headings-font-family; - font-size: 1.2em; - font-weight: bold; - height: @navbar-height; - a { - color: @navbar-default-brand-color; - } - &:hover, - &:focus { - text-decoration: none; - } - >img { - display: block; - } - @media(max-width:@screen-xs-max) {} - } - &__search { - @media (min-width: @screen-md-min) { - .oc-flex-layout.flex-auto; - padding-top: @navbar-padding-vertical - 7px; - padding-bottom: @navbar-padding-vertical - 7px; - @shadow: inset 0 1px 0 rgba(255, 255, 255, .1), - 0 1px 0 rgba(255, 255, 255, .1); - .box-shadow(@shadow); - } - } - &__cart { - position: relative; - } -} \ No newline at end of file diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index accc24e0..072fd6c2 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -19,7 +19,6 @@ @import '_sidebar'; @import '_tables'; @import '_toastr'; -@import '_topnav'; @import '_tree'; @import '_typeahead'; @import '_creditcard'; From a232b74811bb08d619958bf71273994f1c71f7f3 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 13:51:40 -0500 Subject: [PATCH 103/158] Simplify the navigation UI * Remove icons where not needed * Add ordercloud search component to nav * Add TODO for hiding/showing nav items OC-2054 --- src/app/base/templates/base.html | 17 +++++++---------- src/app/styles/shame.less | 1 + 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/app/base/templates/base.html b/src/app/base/templates/base.html index d8832835..264c3a03 100644 --- a/src/app/base/templates/base.html +++ b/src/app/base/templates/base.html @@ -6,13 +6,13 @@ <a class="navmenu-brand" ui-sref="home">{{application.name}}</a> <ul class="nav navmenu-nav"> <li> - <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span>Product Browse</span></a> + <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})">Product Browse</a> </li> <li> - <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> + <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})">Category Browse</a> </li> <li uib-dropdown ng-if="!base.currentUser.Anonymous"> - <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></a> + <a uib-dropdown-toggle role="button">Account <span class="caret"></a> <ul class="dropdown-menu navmenu-nav" uib-dropdown-menu role="menu"> <li> <a ui-sref="account">My Account</a> @@ -51,17 +51,14 @@ </div> <ul class="nav navbar-nav c-desktop-nav"> <li> - <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})"><i class="fa fa-cubes"></i> <span>Product Browse</span></a> + <a ui-sref="productBrowse.products({page:'', favorites:'', sortBy:'', categoryid:''})">Product Browse</a> </li> <li> - <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})"><i class="fa fa-th"></i> <span>Category Browse</span></a> + <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})">Category Browse</a> </li> </ul> <form class="navbar-form navbar-left c-desktop-nav"> - <div class="form-group"> - <input type="text" class="form-control" placeholder="Search"> - </div> - <button type="submit" class="btn btn-default">Submit</button> + <ordercloud-product-search></ordercloud-product-search> </form> <ul class="nav navbar-nav navbar-right"> <li> @@ -70,7 +67,7 @@ </ul> <ul class="nav navbar-nav navbar-right c-desktop-nav" ng-if="!base.currentUser.Anonymous"> <li class="c-desktop-nav" uib-dropdown> - <a uib-dropdown-toggle role="button"><i class="fa fa-user"></i> <span>Account</span> <span class="caret"></span></a> + <a uib-dropdown-toggle role="button">Account <span class="caret"></span></a> <ul class="dropdown-menu-right" uib-dropdown-menu> <li> <a ui-sref="account">My Account</a> diff --git a/src/app/styles/shame.less b/src/app/styles/shame.less index ce4cb867..7a6e5c20 100644 --- a/src/app/styles/shame.less +++ b/src/app/styles/shame.less @@ -62,6 +62,7 @@ li a, margin-left: @navbar-padding-horizontal; } // Hiding certain nav elements on smaller viewports +// TODO: refactor this class and its functionality .c-desktop-nav { @media (max-width: @grid-float-breakpoint-max) { display: none; From 3c70487723101f4830790f54809f6f1e2984eeb2 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 13:53:45 -0500 Subject: [PATCH 104/158] Refactor product search component * Add template for typeahead popup * Move templates for matches and popup to separate file * Use default bootstrap input-group for search input OC-2129 --- .../templates/product-search-match.html | 3 ++ .../templates/product-search-popup.html | 6 +++ .../templates/productSearch.component.html | 45 +++++++++++++++++-- 3 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/app/productSearch/templates/product-search-match.html create mode 100644 src/app/productSearch/templates/product-search-popup.html diff --git a/src/app/productSearch/templates/product-search-match.html b/src/app/productSearch/templates/product-search-match.html new file mode 100644 index 00000000..352a9f7e --- /dev/null +++ b/src/app/productSearch/templates/product-search-match.html @@ -0,0 +1,3 @@ +<a href tabindex="-1" ng-attr-title="{{match.label}}"> + <span ng-bind-html="'<b>' + (match.model.Name | uibTypeaheadHighlight:query) + '</b>' + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></span> +</a> diff --git a/src/app/productSearch/templates/product-search-popup.html b/src/app/productSearch/templates/product-search-popup.html new file mode 100644 index 00000000..1b461252 --- /dev/null +++ b/src/app/productSearch/templates/product-search-popup.html @@ -0,0 +1,6 @@ +<!--<ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" ng-style="{top: position().top+'px', left: position().left+'px'}" role="listbox" aria-hidden="{{!isOpen()}}">--> +<ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" role="listbox" aria-hidden="{{!isOpen()}}"> + <li class="uib-typeahead-match" ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index, $event)" role="option" id="{{::match.id}}"> + <div uib-typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div> + </li> +</ul> \ No newline at end of file diff --git a/src/app/productSearch/templates/productSearch.component.html b/src/app/productSearch/templates/productSearch.component.html index 0c13dc6f..c2621898 100644 --- a/src/app/productSearch/templates/productSearch.component.html +++ b/src/app/productSearch/templates/productSearch.component.html @@ -1,12 +1,51 @@ <form name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit> + <!-- Search Input --> + <div class="input-group"> + <input type="search" + class="form-control" + placeholder="Search Products..." + ng-model="$ctrl.searchTerm" + uib-typeahead="product as product.Name for product in $ctrl.getSearchResults()" + disable-validation-message + typeahead-on-select="$ctrl.onSelect($item.ID)" + typeahead-focus-first="false" + typeahead-wait-ms="300" + typeahead-no-results="noResults" + typeahead-loading="loading" + typeahead-append-to="'.c-typeahead__results'" + typeahead-popup-template-url="productSearch/templates/product-search-popup.html" + typeahead-template-url="productSearch/templates/product-search-match.html" + /> + <span class="input-group-btn"> + <button class="btn btn-default" type="button"><i class="fa fa-search"></i></button> + </span> + </div> + <!-- Typeahead Loading / No Results --> + <div class="c-typeahead__results"> + <div class="c-typeahead__results--empty" ng-if="$ctrl.searchTerm && noResults"> + <span>No matches found</span> + </div> + <div class="c-typeahead__results--loading" ng-if="loading"> + <div class="indicator-container"> + <div class="indicator"> + <div class="animation"> + <div class="dot"></div> + <div class="dot"></div> + <div class="dot"></div> + </div> + </div> + </div> + </div> + </div> +</form> +<!--<form name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit>--> <!-- Typeahead Result Template --> - <script type="text/ng-template" id="oc-product-search-result.html"> + <!--<script type="text/ng-template" id="oc-product-search-result.html"> <a href tabindex="-1" ng-attr-title="{{match.label}}"> <span ng-bind-html="'<b>' + (match.model.Name | uibTypeaheadHighlight:query) + '</b>' + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></span> </a> </script> - <div class="form-group" ng-class="{open:noResults}"> <input type="search" class="form-control" @@ -40,4 +79,4 @@ </div> </div> </div> -</form> +</form>--> From 5c516fb93a598d79c1eb437479ce08f2ef82593f Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 14:17:13 -0500 Subject: [PATCH 105/158] Remove unused minicart styles OC-2054 --- src/app/styles/components/_minicart.less | 60 ------------------- .../styles/components/_modal-minicart.less | 7 --- src/app/styles/components/glob.less | 2 - 3 files changed, 69 deletions(-) delete mode 100644 src/app/styles/components/_minicart.less delete mode 100644 src/app/styles/components/_modal-minicart.less diff --git a/src/app/styles/components/_minicart.less b/src/app/styles/components/_minicart.less deleted file mode 100644 index ac3f27b0..00000000 --- a/src/app/styles/components/_minicart.less +++ /dev/null @@ -1,60 +0,0 @@ -// from base.less -.base-top { - #minicart { - &:extend(.navbar-right); - &:extend(.navbar-form); - margin-right:0; - margin-top:0; - margin-bottom:0; - } -} -// end from base.less - -// from cart.less -.ordercloud-minicart { - flex: 1 0 auto; -} -// end from cart.less - -#minicart { - .btn-group { - .btn-default { - font-weight: bold; - } - } - .dropdown-menu{ - width: 250px; - } - - .express-checkout { - margin-top: @form-group-margin-bottom; - } - - .badge { - background-color:@brand-primary; - } - - #minicartButton{ - padding: 15px 0 15px 15px; - @media(min-width:@screen-sm-min) { - padding-left: 0; - } - } - - #minicart_line_item_list { - padding: 0; - right: 15px; - left: auto; - .minicart-body { - max-height: 30vh; - overflow-y: auto; - overflow-x: hidden; - table { - margin-bottom: 0; - tr, td { - vertical-align: middle; - } - } - } - } -} \ No newline at end of file diff --git a/src/app/styles/components/_modal-minicart.less b/src/app/styles/components/_modal-minicart.less deleted file mode 100644 index 4539ae07..00000000 --- a/src/app/styles/components/_modal-minicart.less +++ /dev/null @@ -1,7 +0,0 @@ -#modalMinicart{ - .modal-footer{ - .express-checkout{ - padding-top: 15px; - } - } -} \ No newline at end of file diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index 072fd6c2..25d5f381 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -7,8 +7,6 @@ @import '_header'; @import '_lineitems'; @import '_loading-indicators'; -@import '_minicart'; -@import '_modal-minicart'; @import '_modals'; @import '_navbar'; @import '_navmenu'; From 62cabdef9974fd5ee0649dbc1fbb7ac4c6eb3ee8 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 15:05:27 -0500 Subject: [PATCH 106/158] Remove outdated less files OC-2054 --- src/app/styles/components/_account.less | 3 - src/app/styles/components/_buyer-select.less | 22 ------ .../styles/components/_catalog-facets.less | 24 ------- src/app/styles/components/_creditcard.less | 28 -------- src/app/styles/components/_header.less | 0 src/app/styles/components/_lineitems.less | 3 - src/app/styles/components/_shipping.less | 4 -- src/app/styles/components/glob.less | 7 -- src/app/styles/pages/_catalog.less | 64 ----------------- src/app/styles/pages/_category-list.less | 69 ------------------- src/app/styles/pages/_checkout.less | 35 ---------- src/app/styles/pages/_home.less | 3 - src/app/styles/pages/_my-orders.less | 3 - src/app/styles/pages/glob.less | 5 -- 14 files changed, 270 deletions(-) delete mode 100644 src/app/styles/components/_account.less delete mode 100644 src/app/styles/components/_buyer-select.less delete mode 100644 src/app/styles/components/_catalog-facets.less delete mode 100644 src/app/styles/components/_creditcard.less delete mode 100644 src/app/styles/components/_header.less delete mode 100644 src/app/styles/components/_lineitems.less delete mode 100644 src/app/styles/components/_shipping.less delete mode 100644 src/app/styles/pages/_catalog.less delete mode 100644 src/app/styles/pages/_category-list.less delete mode 100644 src/app/styles/pages/_checkout.less delete mode 100644 src/app/styles/pages/_home.less delete mode 100644 src/app/styles/pages/_my-orders.less diff --git a/src/app/styles/components/_account.less b/src/app/styles/components/_account.less deleted file mode 100644 index fe838892..00000000 --- a/src/app/styles/components/_account.less +++ /dev/null @@ -1,3 +0,0 @@ -.account-buttons { - margin-bottom: 10px; -} \ No newline at end of file diff --git a/src/app/styles/components/_buyer-select.less b/src/app/styles/components/_buyer-select.less deleted file mode 100644 index b4030d63..00000000 --- a/src/app/styles/components/_buyer-select.less +++ /dev/null @@ -1,22 +0,0 @@ -.btn-select-buyer { - text-align:left; - margin-bottom:10px; - span { - display:block; - white-space: normal; - } -} - -.buyer-list-menu{ - padding:0; - border:0; - background-color:@body-bg; - min-width:400px; - max-width:100%; - .table-fixed-header { - margin-bottom:0; - } - .table-container { - max-height:calc(50vh); - } -} \ No newline at end of file diff --git a/src/app/styles/components/_catalog-facets.less b/src/app/styles/components/_catalog-facets.less deleted file mode 100644 index dd90ec58..00000000 --- a/src/app/styles/components/_catalog-facets.less +++ /dev/null @@ -1,24 +0,0 @@ -.facet-list { - margin-left: 15px; -} - -h4.facet-list { - margin-left: 0!important; - margin-right: 0!important; - border-radius: 4px 4px 4px 4px; -} - -div.facet-list label { - font-weight: normal; - color: @brand-primary; -} - -div.facet-list fieldset:last-child { - margin-bottom: @form-group-margin-bottom; -} - -.facet-list-container { - background-color: #ffffff; - border-radius: 4px 4px 4px 4px; - padding-bottom: 5px; -} \ No newline at end of file diff --git a/src/app/styles/components/_creditcard.less b/src/app/styles/components/_creditcard.less deleted file mode 100644 index 16d252b1..00000000 --- a/src/app/styles/components/_creditcard.less +++ /dev/null @@ -1,28 +0,0 @@ -.visa { - background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjU5LjA1NXB4IiBoZWlnaHQ9IjIwMi4wNjlweCIgdmlld0JveD0iMCAwIDY1OS4wNTUgMjAyLjA2OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjU5LjA1NSAyMDIuMDY5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KCTxnPg0KCQk8cG9seWdvbiBmaWxsPSIjMDAyNDlGIiBwb2ludHM9IjIzMi4xNzgsMTk5LjE2NCAyNjUuNTM5LDMuNDAyIDMxOC44OTgsMy40MDIgMjg1LjUxNCwxOTkuMTY0IAkJIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik00NzkuMDQsOC4yMjJDNDY4LjQ2OCw0LjI1Niw0NTEuOTA0LDAsNDMxLjIxNywwYy01Mi43MjQsMC04OS44NjMsMjYuNTUyLTkwLjE4LDY0LjYwNA0KCQkJYy0wLjI5NywyOC4xMjksMjYuNTE0LDQzLjgyLDQ2Ljc1NCw1My4xODVjMjAuNzcsOS41OTUsMjcuNzUyLDE1LjcxNSwyNy42NTIsMjQuMjgzYy0wLjEzMSwxMy4xMjItMTYuNTg2LDE5LjExNy0zMS45MjIsMTkuMTE3DQoJCQljLTIxLjM1NywwLTMyLjcwMy0yLjk2Ny01MC4yMjctMTAuMjc2bC02Ljg3Ni0zLjExMWwtNy40ODksNDMuODIzYzEyLjQ2Miw1LjQ2NCwzNS41MDksMTAuMTk5LDU5LjQzOCwxMC40NDQNCgkJCWM1Ni4wODksMCw5Mi41MDEtMjYuMjQ3LDkyLjkxNS02Ni44ODJjMC4yMDEtMjIuMjctMTQuMDE2LTM5LjIxNy00NC43OTktNTMuMTg4Yy0xOC42NTEtOS4wNTYtMzAuMDczLTE1LjA5OS0yOS45NTItMjQuMjY5DQoJCQljMC04LjEzNyw5LjY2OC0xNi44MzgsMzAuNTU3LTE2LjgzOGMxNy40NDktMC4yNzEsMzAuMDg4LDMuNTM0LDM5LjkzNyw3LjVsNC43ODEsMi4yNTlMNDc5LjA0LDguMjIyIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik02MTUuODY3LDMuNTg5aC00MS4yMzFjLTEyLjc3MiwwLTIyLjMzMSwzLjQ4Ni0yNy45NCwxNi4yMzRMNDY3LjQ1LDE5OS4yMjZoNTYuMDMxDQoJCQljMCwwLDkuMTYxLTI0LjEyMiwxMS4yMzMtMjkuNDE4YzYuMTIzLDAsNjAuNTU1LDAuMDg0LDY4LjMzNiwwLjA4NGMxLjU5Nyw2Ljg1Myw2LjQ5MiwyOS4zMzQsNi40OTIsMjkuMzM0aDQ5LjUxMkw2MTUuODY3LDMuNTg5DQoJCQkgTTU1MC4wNywxMjkuNzY3YzQuNDEzLTExLjI3OSwyMS4yNTktNTQuNzI0LDIxLjI1OS01NC43MjRjLTAuMzE1LDAuNTIxLDQuMzgtMTEuMzM0LDcuMDc1LTE4LjY4NGwzLjYwNiwxNi44NzgNCgkJCWMwLDAsMTAuMjE3LDQ2LjcyOSwxMi4zNTMsNTYuNTI4TDU1MC4wNywxMjkuNzY3TDU1MC4wNywxMjkuNzY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjMDAyNDlGIiBkPSJNMTg3LjQyNSwzLjU0NWwtNTIuMjQsMTMzLjQ5NWwtNS41NjYtMjcuMTI5Yy05LjcyNS0zMS4yNzMtNDAuMDI1LTY1LjE1Ni03My44OTktODIuMTE5bDQ3Ljc2NywxNzEuMjAzDQoJCQlsNTYuNDU1LTAuMDY0TDI0My45NDYsMy41NDVIMTg3LjQyNSIvPg0KCQk8cGF0aCBmaWxsPSIjRkZBMDAwIiBkPSJNODYuNzIyLDMuNDI0SDAuNjgxTDAsNy40OTdDNjYuOTM5LDIzLjcwMSwxMTEuMjMyLDYyLjg2LDEyOS42MTgsMTA5LjkxMWwtMTguNzA5LTg5Ljk2DQoJCQlDMTA3LjY3OSw3LjU1NSw5OC4zMTEsMy44NTYsODYuNzIyLDMuNDI0Ii8+DQoJPC9nPg0KPC9nPg0KPC9zdmc+DQo='); - background-size: auto 50%; - background-repeat: no-repeat; - background-position-x: 98%; - background-position-y: 50%; -} -.amex { - background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="1.1"
   width="281.89001"
   height="130.42363"
   viewBox="0 0 281.89001 130.42363"
   id="Layer_1"
   xml:space="preserve"><metadata
   id="metadata38"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs36" />
<radialGradient
   cx="57.388199"
   cy="57.021"
   r="264.57971"
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   gradientTransform="matrix(1.0010754,0,0,0.46091624,-7.6472151,-3.502043)">
	<stop
   id="stop4"
   style="stop-color:#9dd5f6;stop-opacity:1"
   offset="0" />
	<stop
   id="stop6"
   style="stop-color:#98d3f5;stop-opacity:1"
   offset="0.0711" />
	<stop
   id="stop8"
   style="stop-color:#89cef3;stop-opacity:1"
   offset="0.1575" />
	<stop
   id="stop10"
   style="stop-color:#70c6ef;stop-opacity:1"
   offset="0.2516" />
	<stop
   id="stop12"
   style="stop-color:#4ebbea;stop-opacity:1"
   offset="0.35139999" />
	<stop
   id="stop14"
   style="stop-color:#23ade3;stop-opacity:1"
   offset="0.45460001" />
	<stop
   id="stop16"
   style="stop-color:#0da6e0;stop-opacity:1"
   offset="0.5" />
	<stop
   id="stop18"
   style="stop-color:#2e77bc;stop-opacity:1"
   offset="1" />
</radialGradient>
<path
   d="M 282.24821,0 H 0 V 130.42363 H 282.24821 V 87.380507 c 1.1212,-0.74622 1.6748,-1.70078 1.6748,-2.86782 0,-1.33574 -0.5536,-2.16309 -1.6748,-2.86"
   id="path20"
   style="fill:url(#SVGID_1_)" />
<g
   transform="translate(-7.639,-88.953933)"
   id="g22">
	<defs
   id="defs24">
		<path
   d="M 289.584,7.598 H 7.639 v 282.966 h 281.945 v -93.386 c 1.12,-1.619 1.673,-3.69 1.673,-6.222 0,-2.898 -0.553,-4.693 -1.673,-6.205"
   id="SVGID_2_" />
	</defs>
	<clipPath
   id="SVGID_3_">
		<use
   id="use28"
   style="overflow:visible"
   x="0"
   y="0"
   width="300"
   height="300"
   xlink:href="#SVGID_2_" />
	</clipPath>
</g>
<path
   d="m 25.414,41.088067 -5.424,-13.217 -5.393,13.217 m 130.307,-5.263 c -1.089,0.661 -2.377,0.683 -3.92,0.683 h -9.627 v -7.364 h 9.758 c 1.381,0 2.822,0.062 3.758,0.598 1.028,0.483 1.664,1.511 1.664,2.931 0,1.449 -0.605,2.615 -1.633,3.152 z m 68.678,5.263 -5.484,-13.217 -5.454,13.217 h 10.938 z m -128.02,14.306 h -8.124 l -0.03,-25.966 -11.491,25.966 h -6.958 l -11.521,-25.989 v 25.989 H 31.32 l -3.045,-7.395 h -16.5 l -3.076,7.395 H 0.092 l 14.191,-33.154 h 11.774 l 13.478,31.39 v -31.39 h 12.934 l 10.371,22.491 9.527,-22.491 h 13.194 v 33.154 z m 32.379,0 H 91.468 v -33.154 h 26.473 v 6.904 H 99.393 v 5.976 h 18.103 v 6.796 H 99.393 v 6.621 h 18.548 v 6.857 z m 37.326,-24.225 c 0,5.286 -3.528,8.017 -5.584,8.837 1.734,0.66 3.215,1.826 3.92,2.792 1.119,1.649 1.312,3.122 1.312,6.083 v 6.513 h -7.993 l -0.03,-4.181 c 0,-1.995 0.191,-4.864 -1.251,-6.459 -1.158,-1.166 -2.923,-1.419 -5.776,-1.419 h -8.507 v 12.059 h -7.924 v -33.154 h 18.227 c 4.05,0 7.034,0.107 9.596,1.588 2.507,1.481 4.01,3.643 4.01,7.341 z m 12.682,24.225 h -8.086 v -33.154 h 8.086 v 33.154 z m 93.808,0 h -11.23 l -15.021,-24.884 v 24.884 h -16.139 l -3.084,-7.395 h -16.462 l -2.992,7.395 h -9.273 c -3.852,0 -8.729,-0.852 -11.491,-3.667 -2.785,-2.815 -4.234,-6.628 -4.234,-12.657 0,-4.917 0.866,-9.412 4.272,-12.964 2.562,-2.646 6.574,-3.866 12.035,-3.866 h 7.672 v 7.104 h -7.511 c -2.892,0 -4.525,0.43 -6.098,1.964 -1.351,1.396 -2.278,4.035 -2.278,7.51 0,3.552 0.706,6.113 2.179,7.786 1.22,1.312 3.437,1.71 5.523,1.71 h 3.559 l 11.169,-26.073 h 11.874 l 13.417,31.359 v -31.359 h 12.066 l 13.93,23.09 v -23.09 h 8.117 v 33.153 z M 0,61.906067 h 13.54 l 3.053,-7.364 h 6.835 l 3.045,7.364 h 26.641 v -5.63 l 2.378,5.654 h 13.83 l 2.378,-5.738 v 5.714 h 66.208 l -0.031,-12.088 h 1.281 c 0.897,0.031 1.159,0.114 1.159,1.595 v 10.493 h 34.243 v -2.814 c 2.762,1.48 7.058,2.814 12.711,2.814 h 14.406 l 3.083,-7.364 h 6.835 l 3.015,7.364 h 27.761 v -6.995 l 4.204,6.995 h 22.246 v -46.24 h -22.016 v 5.461 l -3.083,-5.461 h -22.591 v 5.461 l -2.831,-5.461 h -30.515 c -5.108,0 -9.598,0.713 -13.225,2.7 v -2.7 h -21.058 v 2.7 c -2.308,-2.048 -5.453,-2.7 -8.95,-2.7 H 67.619 l -5.162,11.943 -5.301,-11.943 H 32.924 v 5.461 l -2.662,-5.461 H 9.596 l -9.597,21.985 v 24.255 z"
   id="path30"
   style="fill:#ffffff" />
<path
   d="m 281.945,86.361067 h -14.443 c -1.442,0 -2.4,0.054 -3.207,0.599 -0.836,0.537 -1.158,1.334 -1.158,2.386 0,1.251 0.706,2.102 1.733,2.47 0.836,0.291 1.734,0.376 3.054,0.376 l 4.295,0.115 c 4.334,0.107 7.227,0.852 8.991,2.669 0.321,0.253 0.514,0.537 0.735,0.821 m 0,12.427003 c -1.925,2.815 -5.676,4.242 -10.754,4.242 h -15.304 v -7.111 h 15.242 c 1.512,0 2.57,-0.199 3.207,-0.821 0.552,-0.513 0.937,-1.258 0.937,-2.163 0,-0.966 -0.385,-1.733 -0.968,-2.193 -0.575,-0.506003 -1.412,-0.736003 -2.792,-0.736003 -7.441,-0.253 -16.724,0.23 -16.724,-10.264 0,-4.81 3.054,-9.873 11.37,-9.873 h 15.785 v -6.598 h -14.666 c -4.426,0 -7.641,1.06 -9.918,2.708 v -2.708 h -21.693 c -3.469,0 -7.541,0.86 -9.467,2.708 v -2.708 h -38.738 v 2.708 c -3.083,-2.224 -8.285,-2.708 -10.686,-2.708 h -25.552 v 2.708 c -2.439,-2.362 -7.863,-2.708 -11.169,-2.708 h -28.597 l -6.544,7.082 -6.129,-7.082 H 56.067 v 46.272003 h 41.914 l 6.743,-7.194 6.352,7.194 25.836,0.023 v -10.885 h 2.54 c 3.428,0.053 7.471,-0.085 11.038,-1.627 v 12.488 h 21.31 v -12.06 h 1.028 c 1.312,0 1.441,0.054 1.441,1.365 v 10.694 h 64.736 c 4.11,0 8.406,-1.052 10.785,-2.961 v 2.961 h 20.534 c 4.273,0 8.446,-0.599 11.621,-2.133 v -8.62 z M 250.334,94.976067 c 1.543,1.597 2.37,3.613 2.37,7.026003 0,7.134 -4.457,10.464 -12.449,10.464 H 224.82 v -7.111 h 15.373 c 1.503,0 2.569,-0.199 3.237,-0.821 0.545,-0.513 0.936,-1.258 0.936,-2.163 0,-0.966 -0.423,-1.733 -0.967,-2.193 -0.606,-0.506003 -1.442,-0.736003 -2.822,-0.736003 -7.411,-0.253 -16.692,0.23 -16.692,-10.264 0,-4.81 3.022,-9.873 11.33,-9.873 h 15.887 v 7.058 h -14.537 c -1.441,0 -2.378,0.054 -3.175,0.599 -0.868,0.537 -1.19,1.334 -1.19,2.386 0,1.251 0.737,2.102 1.734,2.47 0.836,0.291 1.734,0.376 3.084,0.376 l 4.266,0.115 c 4.302,0.105 7.255,0.849 9.05,2.667 z m -71.508,-2.048 c -1.06,0.629 -2.371,0.683 -3.913,0.683 h -9.627 v -7.448 h 9.758 c 1.411,0 2.823,0.03 3.782,0.599 1.027,0.537 1.641,1.564 1.641,2.983 0,1.419 -0.614,2.562 -1.641,3.183 z m 4.786,4.127 c 1.764,0.651 3.206,1.818 3.882,2.784 1.119,1.619003 1.281,3.130003 1.313,6.053003 v 6.574 h -7.956 v -4.149 c 0,-1.995 0.192,-4.949 -1.281,-6.491 -1.158,-1.188 -2.923,-1.472 -5.814,-1.472 h -8.469 v 12.112 h -7.963 V 79.304067 h 18.296 c 4.012,0 6.934,0.177 9.535,1.565 2.501,1.511 4.074,3.581 4.074,7.364 -0.001,5.293 -3.531,7.994 -5.617,8.822 z m 10.011,-17.751 h 26.449 v 6.858 h -18.557 v 6.029 h 18.104 v 6.766 h -18.104 v 6.598003 l 18.557,0.03 v 6.881 H 193.623 V 79.304067 z m -53.467,15.304 h -10.241 v -8.445 h 10.333 c 2.861,0 4.847,1.166 4.847,4.066 0,2.868 -1.894,4.379 -4.939,4.379 z m -18.134,14.842003 -12.167,-13.508003 12.167,-13.079 v 26.587003 z m -31.421,-3.895 H 71.117 v -6.598003 h 17.398 v -6.766 H 71.117 v -6.029 h 19.868 l 8.668,9.664 -9.052,9.729003 z m 63.002,-15.326003 c 0,9.212 -6.873,11.114003 -13.8,11.114003 h -9.888 v 11.123 h -15.403 l -9.758,-10.978 -10.141,10.978 H 63.223 V 79.304067 h 31.873 l 9.75,10.87 10.08,-10.87 h 25.322 c 6.289,0 13.355,1.741 13.355,10.925 z"
   id="path32"
   style="fill:#ffffff" />
</svg>'); - background-size: auto 80%; - background-repeat: no-repeat; - background-position-x: 98%; - background-position-y: 50%; -} -.mastercard { - background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 width="300px" height="180px" viewBox="0 0 300 180" style="enable-background:new 0 0 300 180;" xml:space="preserve">
<g id="layer1">
	<g id="g10305">
		<path id="path2268" style="fill:#FF9900;" d="M298.032,90.5c0.014,48.936-39.646,88.614-88.582,88.627
			c-48.937,0.012-88.614-39.646-88.627-88.582c0-0.016,0-0.029,0-0.045c-0.013-48.935,39.647-88.615,88.581-88.628
			c48.937-0.013,88.615,39.647,88.628,88.583C298.032,90.47,298.032,90.484,298.032,90.5z"/>
		<path id="path1350" style="fill:#CC0000;" d="M90.001,1.895C41.355,2.204,1.967,41.781,1.967,90.5
			c0,48.909,39.695,88.604,88.605,88.604c22.955,0,43.879-8.748,59.624-23.086c-0.001,0-0.003-0.002-0.007-0.004h0.019
			c3.224-2.938,6.231-6.108,8.995-9.488H141.05c-2.424-2.928-4.627-5.979-6.606-9.127h31.308c1.904-3.047,3.628-6.211,5.158-9.488
			h-41.635c-1.419-3.042-2.651-6.153-3.703-9.309h49.045c2.956-8.832,4.56-18.281,4.56-28.103c0-6.512-0.706-12.861-2.042-18.974
			h-54.164c0.671-3.146,1.518-6.254,2.528-9.308h49.063c-1.097-3.25-2.371-6.417-3.82-9.487H129.27
			c1.496-3.196,3.191-6.305,5.084-9.307h31.285c-2.082-3.317-4.386-6.486-6.877-9.488h-17.443c2.697-3.174,5.666-6.163,8.889-8.95
			c-15.746-14.34-36.676-23.09-59.636-23.09C90.381,1.895,90.192,1.894,90.001,1.895z"/>
		<path id="use9412" style="fill:#FCB340;" d="M289.143,136.82c0.482,0,0.951,0.125,1.409,0.371c0.46,0.246,0.814,0.601,1.07,1.062
			c0.256,0.456,0.384,0.937,0.384,1.435c0,0.492-0.127,0.968-0.379,1.424c-0.251,0.455-0.605,0.81-1.061,1.063
			c-0.451,0.249-0.928,0.375-1.424,0.375s-0.972-0.126-1.426-0.375c-0.455-0.254-0.807-0.607-1.063-1.063
			c-0.252-0.456-0.377-0.932-0.377-1.424c0-0.498,0.127-0.979,0.384-1.435c0.258-0.461,0.614-0.813,1.071-1.062
			C288.193,136.945,288.662,136.82,289.143,136.82 M289.143,137.295c-0.401,0-0.793,0.104-1.176,0.311
			c-0.38,0.207-0.677,0.5-0.891,0.888c-0.217,0.382-0.325,0.778-0.325,1.194c0,0.412,0.106,0.81,0.315,1.188
			c0.214,0.377,0.51,0.673,0.888,0.885c0.381,0.211,0.776,0.315,1.188,0.315c0.414,0,0.81-0.104,1.189-0.315
			c0.378-0.212,0.673-0.508,0.884-0.885c0.209-0.378,0.313-0.775,0.313-1.188c0-0.416-0.106-0.813-0.321-1.194
			c-0.213-0.388-0.511-0.681-0.894-0.888C289.934,137.398,289.544,137.295,289.143,137.295 M287.887,141.27v-3.082h1.062
			c0.36,0,0.622,0.028,0.784,0.088c0.162,0.057,0.291,0.154,0.388,0.297c0.095,0.141,0.144,0.291,0.144,0.451
			c0,0.226-0.08,0.422-0.242,0.588c-0.158,0.166-0.373,0.261-0.639,0.281c0.109,0.045,0.196,0.102,0.264,0.164
			c0.125,0.12,0.275,0.323,0.455,0.61l0.375,0.603h-0.606l-0.272-0.485c-0.215-0.382-0.388-0.62-0.521-0.718
			c-0.091-0.069-0.224-0.105-0.397-0.105h-0.293v1.311h-0.5 M288.385,139.535h0.604c0.288,0,0.483-0.044,0.588-0.129
			c0.106-0.088,0.159-0.2,0.159-0.342c0-0.092-0.024-0.174-0.075-0.244c-0.052-0.073-0.122-0.125-0.213-0.162
			c-0.089-0.035-0.255-0.055-0.497-0.055h-0.564v0.932"/>
	</g>
	<g id="g16480">
		<g id="g13802" transform="translate(-13.74405,15.9939)">
			<path id="path13804" style="fill:#000066;" d="M133.719,99.926l1.18-8.02c-0.645,0-1.593,0.279-2.431,0.279
				c-3.284,0-3.694-1.755-3.436-3.037l3.236-16.13h4.992l1.029-9.103h-4.705l0.958-5.516H124.7
				c-0.208,0.208-5.568,31.022-5.568,34.776c0,5.555,3.118,8.027,7.516,7.988C130.09,101.134,132.773,100.181,133.719,99.926z"/>
			<path id="path13806" style="fill:#000066;" d="M136.706,84.638c0,13.332,8.799,16.499,16.297,16.499
				c6.921,0,10.55-1.604,10.55-1.604l1.662-9.1c0,0-5.848,2.378-10.601,2.378c-10.131,0-8.355-7.554-8.355-7.554l19.463,0.059
				c0,0,1.239-6.111,1.239-8.602c0-6.217-3.387-13.849-13.745-13.849C143.73,62.867,136.706,73.088,136.706,84.638z M153.252,71.313
				c5.324,0,4.342,5.984,4.342,6.469H147.12C147.12,77.162,148.109,71.313,153.252,71.313z"/>
			<path id="path13808" style="fill:#000066;" d="M212.99,99.923l1.689-10.284c0,0-4.632,2.321-7.807,2.321
				c-6.693,0-9.378-5.11-9.378-10.601c0-11.137,5.758-17.265,12.168-17.265c4.808,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-4.554-3.289-9.456-3.308c-14.745-0.058-23.182,10.208-23.182,27.955c0,11.763,6.248,19.768,17.506,19.768
				C207.918,101.215,212.99,99.923,212.99,99.923z"/>
			<path id="path13810" style="fill:#000066;" d="M81.83,63.012c-6.469,0-11.427,2.079-11.427,2.079l-1.37,8.127
				c0,0,4.093-1.663,10.281-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.314,2.374-0.314,2.374s-2.772-0.231-4.056-0.231
				c-9.21,0-16.729,3.482-16.729,13.98c0,8.273,5.623,10.17,9.108,10.17c6.657,0,9.292-4.203,9.444-4.215l-0.077,3.488
				c0,0,8.306,0,8.307,0l3.706-25.98C94.786,63.366,85.17,63.012,81.83,63.012z M83.268,84.108c0.181,1.586-0.41,9.086-6.092,9.086
				c-2.93,0-3.691-2.24-3.691-3.562c0-2.584,1.403-5.683,8.315-5.683C83.41,83.949,82.997,84.065,83.268,84.108z"/>
			<path id="path13812" style="fill:#000066;" d="M103.615,100.906c2.125,0,14.272,0.541,14.272-11.994
				c0-11.721-11.244-9.404-11.244-14.114c0-2.342,1.833-3.08,5.184-3.08c1.329,0,6.447,0.423,6.447,0.423l1.189-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.802,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.287-5.844,3.287c-4.401,0-8.363-1.511-8.377-1.438l-1.259,8.245C93.257,99.819,95.702,100.906,103.615,100.906z"
				/>
			<path id="path13814" style="fill:#000066;" d="M290.807,55.455l-1.705,12.709c0,0-3.553-4.905-9.112-4.905
				c-10.459,0-15.849,10.423-15.849,22.396c0,7.73,3.844,15.307,11.699,15.307c5.651,0,8.784-3.941,8.784-3.941l-0.415,3.365h9.178
				l7.207-44.862L290.807,55.455z M286.755,80.156c0,4.983-2.468,11.64-7.581,11.64c-3.396,0-4.988-2.851-4.988-7.324
				c0-7.315,3.285-12.14,7.432-12.14C285.012,72.332,286.755,74.662,286.755,80.156z"/>
			<path id="path13816" style="fill:#000066;" d="M30.749,100.423l5.743-33.87l0.844,33.87h6.499l12.125-33.87l-5.371,33.87h9.658
				l7.437-44.922l-15.342-0.117l-9.126,27.504l-0.25-27.387h-14.06l-7.544,44.922H30.749L30.749,100.423z"/>
			<path id="path13818" style="fill:#000066;" d="M176.101,100.487c2.746-15.615,3.724-27.947,11.732-25.393
				c1.15-6.044,3.891-11.3,5.143-13.858c0,0-0.396-0.589-2.871-0.589c-4.225,0-9.866,8.574-9.866,8.574l0.843-5.301h-8.786
				l-5.884,36.566H176.101z"/>
			<g id="use14699" transform="translate(845.3001,0)">
				<path id="path13810_1_" style="fill:#000066;" d="M-612.55,63.012c-6.472,0-11.43,2.079-11.43,2.079l-1.369,8.127
					c0,0,4.095-1.663,10.28-1.663c3.514,0,6.083,0.395,6.083,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.231-4.055-0.231
					c-9.211,0-16.729,3.482-16.729,13.98c0,8.273,5.622,10.17,9.107,10.17c6.655,0,9.292-4.203,9.443-4.215l-0.078,3.488h8.309
					l3.705-25.98C-599.596,63.366-609.212,63.012-612.55,63.012z M-611.114,84.108c0.18,1.586-0.411,9.086-6.092,9.086
					c-2.932,0-3.692-2.24-3.692-3.562c0-2.584,1.402-5.683,8.315-5.683C-610.972,83.949-611.384,84.065-611.114,84.108z"/>
			</g>
			<path id="use14701" style="fill:#000066;" d="M255.266,100.487c1.508-11.488,4.299-27.616,11.731-25.393
				c1.149-6.044,0.041-6.028-2.433-6.028c-4.228,0-5.164,0.154-5.164,0.154l0.844-5.301h-8.785l-5.884,36.567H255.266
				L255.266,100.487z"/>
		</g>
		<g id="g10289">
			<path id="path4157" style="fill:#FFFFFF;" d="M122.434,113.059l1.181-8.019c-0.645,0-1.594,0.276-2.431,0.276
				c-3.284,0-3.646-1.746-3.437-3.037l2.653-16.362h4.991l1.205-8.87h-4.706l0.958-5.516h-9.434
				c-0.208,0.208-5.569,31.023-5.569,34.775c0,5.555,3.119,8.029,7.517,7.989C118.806,114.266,121.488,113.313,122.434,113.059z"/>
			<path id="path4155" style="fill:#FFFFFF;" d="M125.423,97.77c0,13.332,8.8,16.5,16.297,16.5c6.92,0,9.965-1.547,9.965-1.547
				l1.662-9.099c0,0-5.264,2.319-10.018,2.319c-10.13,0-8.356-7.553-8.356-7.553h19.172c0,0,1.238-6.113,1.238-8.604
				c0-6.216-3.094-13.79-13.452-13.79C132.445,75.998,125.423,86.219,125.423,97.77z M141.967,84.445
				c5.324,0,4.342,5.983,4.342,6.467h-10.474C135.835,90.294,136.825,84.445,141.967,84.445z"/>
			<path id="path4151" style="fill:#FFFFFF;" d="M201.707,113.055l1.688-10.285c0,0-4.629,2.321-7.806,2.321
				c-6.692,0-9.376-5.11-9.376-10.6c0-11.137,5.758-17.264,12.168-17.264c4.807,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-5.721-2.315-10.625-2.315c-10.891,0-21.486,9.448-21.486,27.192c0,11.766,5.721,19.537,16.979,19.537
				C196.637,114.348,201.707,113.055,201.707,113.055z"/>
			<path id="path4149" style="fill:#FFFFFF;" d="M70.547,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.369,8.127
				c0,0,4.093-1.663,10.28-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.315,2.374-0.315,2.374s-2.771-0.232-4.054-0.232
				c-8.159,0-16.73,3.482-16.73,13.98c0,8.272,5.623,10.17,9.108,10.17c6.656,0,9.525-4.319,9.678-4.332l-0.311,3.605h8.307
				l3.706-25.981C83.502,76.498,73.887,76.143,70.547,76.143z M72.568,97.297c0.18,1.587-0.995,9.026-6.675,9.026
				c-2.93,0-3.692-2.238-3.692-3.562c0-2.582,1.403-5.682,8.316-5.682C72.125,97.081,72.297,97.253,72.568,97.297z"/>
			<path id="path4145" style="fill:#FFFFFF;" d="M92.331,114.038c2.125,0,14.273,0.54,14.273-11.995
				c0-11.719-11.245-9.404-11.245-14.112c0-2.344,1.833-3.082,5.183-3.082c1.33,0,6.447,0.423,6.447,0.423l1.19-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.801,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.284-5.843,3.284c-4.401,0-8.364-1.51-8.378-1.438l-1.258,8.246C81.973,112.948,84.417,114.038,92.331,114.038z"/>
			<path id="path4139" style="fill:#FFFFFF;" d="M279.852,68.668l-2.035,12.627c0,0-3.551-4.905-9.11-4.905
				c-8.644,0-15.849,10.422-15.849,22.397c0,7.73,3.843,15.304,11.699,15.304c5.651,0,8.784-3.94,8.784-3.94l-0.415,3.365h9.176
				l7.207-44.863L279.852,68.668z M275.471,93.288c0,4.983-2.467,11.639-7.582,11.639c-3.395,0-4.986-2.85-4.986-7.323
				c0-7.314,3.285-12.14,7.43-12.14C273.729,85.463,275.471,87.796,275.471,93.288z"/>
			<path id="path4133" style="fill:#FFFFFF;" d="M19.466,113.555l5.743-33.87l0.843,33.87h6.5l12.125-33.87l-5.371,33.87h9.658
				l7.438-44.923H41.467l-9.301,27.563l-0.484-27.563H17.915l-7.545,44.923H19.466z"/>
			<path id="path4131" style="fill:#FFFFFF;" d="M164.818,113.617c2.746-15.616,3.255-28.296,9.808-25.975
				c1.147-6.044,2.254-8.382,3.506-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
				l-5.885,36.567H164.818z"/>
			<g id="use8523" transform="translate(847.0062,0)">
				<path id="path4149_1_" style="fill:#FFFFFF;" d="M-623.531,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.368,8.127
					c0,0,4.093-1.663,10.28-1.663c3.513,0,6.081,0.395,6.081,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.232-4.055-0.232
					c-8.158,0-16.729,3.482-16.729,13.98c0,8.272,5.622,10.17,9.107,10.17c6.656,0,9.525-4.319,9.677-4.332l-0.309,3.605
					c0,0,8.304,0,8.307,0l3.705-25.981C-610.575,76.498-620.191,76.143-623.531,76.143z M-621.507,97.297
					c0.18,1.587-0.996,9.026-6.678,9.026c-2.93,0-3.69-2.238-3.69-3.562c0-2.582,1.403-5.682,8.315-5.682
					C-621.952,97.081-621.781,97.253-621.507,97.297z"/>
			</g>
			<g id="use8525" transform="translate(442.2857,0)">
				<path id="path4131_1_" style="fill:#FFFFFF;" d="M-198.263,113.617c2.747-15.616,3.256-28.296,9.807-25.975
					c1.149-6.044,2.257-8.382,3.508-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
					l-5.885,36.567H-198.263z"/>
			</g>
			<path id="text9407" style="fill:#FFFFFF;" d="M289.105,107.975c0.479,0,0.951,0.123,1.406,0.373
				c0.459,0.242,0.816,0.598,1.072,1.059c0.257,0.458,0.383,0.935,0.383,1.434c0,0.493-0.126,0.969-0.379,1.424
				c-0.251,0.455-0.604,0.812-1.059,1.063c-0.454,0.25-0.93,0.376-1.424,0.376c-0.498,0-0.974-0.126-1.429-0.376
				c-0.454-0.253-0.806-0.608-1.058-1.063c-0.256-0.455-0.381-0.931-0.381-1.424c0-0.499,0.127-0.976,0.384-1.434
				c0.258-0.461,0.616-0.815,1.073-1.059C288.154,108.098,288.626,107.975,289.105,107.975 M289.105,108.447
				c-0.401,0-0.793,0.104-1.176,0.313c-0.382,0.204-0.679,0.499-0.894,0.885c-0.214,0.381-0.322,0.78-0.322,1.194
				s0.104,0.81,0.313,1.188c0.213,0.377,0.509,0.673,0.891,0.886c0.378,0.208,0.773,0.313,1.188,0.313
				c0.412,0,0.81-0.105,1.188-0.313c0.378-0.213,0.674-0.509,0.884-0.886c0.211-0.381,0.314-0.774,0.314-1.188
				s-0.107-0.813-0.321-1.194c-0.213-0.386-0.51-0.681-0.894-0.885C289.896,108.552,289.507,108.447,289.105,108.447
				 M287.85,112.423v-3.083h1.061c0.361,0,0.625,0.029,0.785,0.088c0.162,0.055,0.289,0.154,0.388,0.297
				c0.097,0.142,0.146,0.291,0.146,0.451c0,0.225-0.082,0.422-0.244,0.588c-0.158,0.166-0.371,0.262-0.637,0.28
				c0.106,0.046,0.194,0.101,0.262,0.163c0.123,0.122,0.275,0.326,0.455,0.611l0.377,0.604h-0.609l-0.271-0.485
				c-0.216-0.383-0.389-0.621-0.521-0.718c-0.091-0.071-0.224-0.106-0.399-0.106h-0.291v1.311L287.85,112.423 M288.348,110.688
				h0.604c0.289,0,0.484-0.043,0.588-0.129c0.105-0.084,0.16-0.199,0.16-0.342c0-0.091-0.025-0.173-0.075-0.242
				c-0.051-0.074-0.122-0.127-0.213-0.164c-0.091-0.035-0.254-0.053-0.498-0.053h-0.565V110.688"/>
		</g>
	</g>
</g>
</svg>
'); - background-size: auto 80%; - background-repeat: no-repeat; - background-position-x: 98%; - background-position-y: 50%; -} -.discover { - background-image: url('data:image/svg+xml;base64,<?xml version="1.0" standalone="no"?><!-- no kidding around my files... (http://www.dodero.eu) --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg id="Untitled-Page%201" viewBox="0 0 1430 880" style="background-color:#ffffff00" version="1.1"	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"	x="0px" y="0px" width="1430px" height="880px">	<defs>		<radialGradient id="gradient1" cx="50.6977%" cy="50%" r="50%">			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>			<stop stop-color="#ff8000" stop-opacity="1" offset="100%"/>		</radialGradient>	</defs>	<g>		<rect x="0" y="-1" width="1430" height="880" fill="#ffffff"/>		<path d="M 1429.98 879.0058 L 357.3838 878.9818 C 507.3335 853.6667 738.6665 804.3334 1014.6665 711.6667 C 1290.6665 619 1415.3335 525.8333 1429.98 517.9085 L 1429.98 879.0058 Z" fill="#ff8000"/>		<g>			<path d="M 150.0288 399.6931 C 178.333 399.6931 200.3457 390.7787 216.0825 372.9343 C 231.8193 355.1056 239.6875 330.0635 239.6875 297.8238 C 239.6875 267.5213 232.2563 244.3376 217.4253 228.2572 C 202.5781 212.1924 181.2056 204.1443 153.3232 204.1443 L 75.8262 204.1443 L 75.8262 399.6931 L 150.0288 399.6931 L 150.0288 399.6931 ZM 113.7939 231.3598 L 136.2437 231.3598 C 150.5601 231.3598 161.457 232.9978 168.9507 236.258 C 176.4287 239.5182 182.8296 245.4244 188.1372 253.9765 C 195.8496 266.4188 199.7212 281.9795 199.7212 300.6587 C 199.7212 324.8188 194.9131 342.8365 185.2959 354.6961 C 175.6792 366.5556 161.0977 372.4775 141.5518 372.4775 L 113.7939 372.4775 L 113.7939 231.3598 L 113.7939 231.3598 Z" fill="#000000"/>			<path d="M 311.627 399.6931 L 311.627 204.1443 L 273.6587 204.1443 L 273.6587 399.6931 L 311.627 399.6931 L 311.627 399.6931 Z" fill="#000000"/>			<path d="M 391.2114 404.733 C 413.1304 404.733 430.3188 399.5829 442.793 389.251 C 455.251 378.9349 461.4956 364.6814 461.4956 346.5062 C 461.4956 333.7174 458.2017 322.8816 451.6138 313.9673 C 445.0254 305.0529 433.0513 295.3195 415.6597 284.7672 L 402.7485 276.9868 C 393.0693 271.0965 386.6216 266.1353 383.4058 262.1034 C 380.1738 258.0714 378.5659 253.378 378.5659 248.0231 C 378.5659 241.5342 381.0171 236.3053 385.9346 232.3048 C 390.8369 228.3202 397.3623 226.3199 405.5117 226.3199 C 416.0498 226.3199 430.3813 230.0211 448.5068 237.4078 L 448.5068 206.1603 C 430.5376 201.4668 414.395 199.1044 400.0791 199.1044 C 382.188 199.1044 367.7939 204.0025 356.9126 213.7989 C 346.0308 223.5952 340.5981 236.5573 340.5981 252.7007 C 340.5981 264.7966 343.9233 275.3489 350.5894 284.3893 C 357.2402 293.4296 368.6523 302.8637 384.8262 312.6758 L 396.894 319.9049 C 406.6357 325.8583 413.1772 331.0242 416.5181 335.3869 C 419.8594 339.7653 421.5298 345.1202 421.5298 351.4516 C 421.5298 359.484 418.7505 365.8469 413.1929 370.5088 C 407.6353 375.1865 400.0166 377.5175 390.3687 377.5175 C 376.5679 377.5175 359.9878 373.1548 340.5981 364.4137 L 340.5981 397.6771 C 359.8315 402.3706 376.6924 404.733 391.2114 404.733 L 391.2114 404.733 Z" fill="#000000"/>			<path d="M 628.5 360.5838 C 608.3164 370.0193 606.1743 376.725 586.3735 376.725 C 564.2754 376.725 547.0322 370.1138 534.6436 356.8914 C 522.2378 343.6691 516.0435 325.2556 516.0435 301.6195 C 516.0435 277.5731 521.7852 259.0018 533.3037 245.9057 C 544.8223 232.8096 561.1782 231.2706 582.3887 231.2706 C 598.9707 231.2706 601.7046 235.3099 626.2729 243.3885 L 626.2729 211.0742 C 604.188 204.579 600.623 201 578.6826 201 C 544.3008 201 517.853 207.9112 499.3047 225.7093 C 480.7568 243.5232 471.5 268.9581 471.5 301.9982 C 471.5 334.4387 480.7222 359.7158 499.1655 377.8295 C 517.6089 395.9431 543.3608 405 576.4204 405 C 603.4946 405 608.9604 400.9607 628.5 392.8821 L 628.5 360.5838 Z" fill="#000000"/>			<path d="M 971.1035 399.6931 L 1036.0176 204.1443 L 1004.8374 204.1443 L 954.583 355.4993 L 903.2515 204.1443 L 865.1602 204.1443 L 931.4795 399.6931 L 971.1035 399.6931 Z" fill="#000000"/>			<path d="M 1177.896 399.6931 L 1177.896 372.4775 L 1097.9634 372.4775 L 1097.9634 313.0065 L 1157.9131 313.0065 L 1157.9131 285.791 L 1097.9634 285.791 L 1097.9634 231.3598 L 1171.9009 231.3598 L 1171.9009 204.1443 L 1059.9956 204.1443 L 1059.9956 399.6931 L 1177.896 399.6931 L 1177.896 399.6931 Z" fill="#000000"/>			<path d="M 1242.8394 399.6931 L 1242.8394 320.0624 L 1263.0098 320.0624 L 1307.9092 399.6931 L 1353.7456 399.6931 L 1294.374 308.2816 C 1305.3804 303.0054 1314.0293 295.4141 1320.3208 285.5232 C 1326.6123 275.6324 1329.7656 264.6548 1329.7656 252.5905 C 1329.7656 220.3035 1311.5313 204.1443 1275.062 204.1443 L 1207.8691 204.1443 L 1207.8691 399.6931 L 1242.8394 399.6931 L 1242.8394 399.6931 ZM 1242.8394 231.3598 L 1255.7349 231.3598 C 1279.7769 231.3598 1291.7979 240.0222 1291.7979 257.3154 C 1291.7979 281.0031 1278.3252 292.8469 1251.3945 292.8469 L 1242.8394 292.8469 L 1242.8394 231.3598 L 1242.8394 231.3598 Z" fill="#000000"/>			<path id="Ellipse" d="M 645.5 302.5 C 645.5 243.1286 693.6284 195 753 195 C 812.3716 195 860.5 243.1286 860.5 302.5 C 860.5 361.8714 812.3716 410 753 410 C 693.6284 410 645.5 361.8714 645.5 302.5 Z" fill="url(#gradient1)"/>		</g>		<g>			<path d="M 437 524 L 437 479.0625 L 469.3438 524 L 481 524 L 481 458 L 470 458 L 470 502.9375 L 437.6563 458 L 426 458 L 426 524 L 437 524 L 437 524 Z" fill="#000000"/>			<path d="M 559.3999 524 L 559.3999 515 L 529.3999 515 L 529.3999 494 L 552.3999 494 L 552.3999 485 L 529.3999 485 L 529.3999 467 L 557.3999 467 L 557.3999 458 L 515.3999 458 L 515.3999 524 L 559.3999 524 L 559.3999 524 Z" fill="#000000"/>			<path d="M 619.7998 524 L 619.7998 467 L 643.7998 467 L 643.7998 458 L 581.7998 458 L 581.7998 467 L 605.7998 467 L 605.7998 524 L 619.7998 524 L 619.7998 524 Z" fill="#000000"/>			<path d="M 693.3408 524 L 703.7002 478.4063 L 713.2158 524 L 726.4971 524 L 744.2002 458 L 734.5439 458 L 721.7002 506.375 L 711.7158 458 L 699.6533 458 L 688.7002 506.6563 L 676.2783 458 L 663.2002 458 L 680.2158 524 L 693.3408 524 L 693.3408 524 Z" fill="#000000"/>			<path d="M 826.3813 514.8594 C 832.522 508.7656 835.6001 500.4375 835.6001 489.875 C 835.6001 479.5469 832.522 471.3125 826.3813 465.1875 C 820.2251 459.0625 811.9751 456 801.6157 456 C 791.1938 456 782.9126 459.0625 776.7876 465.1875 C 770.6626 471.3125 767.6001 479.5938 767.6001 490 C 767.6001 500.3125 770.647 508.5469 776.7407 514.7344 C 782.8345 520.9219 790.9751 524 801.1626 524 C 811.8188 524 820.2251 520.9531 826.3813 514.8594 L 826.3813 514.8594 ZM 787.022 508.1406 C 783.397 503.5625 781.6001 497.5156 781.6001 489.9844 C 781.6001 482.3906 783.4126 476.3281 787.0532 471.7969 C 790.6782 467.2656 795.5376 465 801.6313 465 C 807.6313 465 812.4595 467.2656 816.1157 471.7969 C 819.772 476.3281 821.6001 482.3438 821.6001 489.8438 C 821.6001 497.5781 819.772 503.7031 816.147 508.2188 C 812.5063 512.75 807.5688 515 801.3345 515 C 795.4126 515 790.647 512.7188 787.022 508.1406 L 787.022 508.1406 Z" fill="#000000"/>			<path d="M 880 524 L 880 497 L 886.3906 497 L 903.0938 524 L 920 524 L 898.2344 493.25 C 902.2031 491.4688 905.3125 488.8906 907.5938 485.5469 C 909.8594 482.2031 911 478.4844 911 474.3906 C 911 463.4688 904.2656 458 890.8125 458 L 866 458 L 866 524 L 880 524 L 880 524 ZM 880 467 L 884.4844 467 C 892.8281 467 897 469.9531 897 475.8594 C 897 483.9531 892.3125 488 882.9688 488 L 880 488 L 880 467 L 880 467 Z" fill="#000000"/>			<path d="M 961.3999 524 L 961.3999 491.5313 L 986.6655 524 L 1003.6499 524 L 975.2593 487.5156 L 997.6499 458 L 985.6812 458 L 961.3999 490 L 961.3999 458 L 947.3999 458 L 947.3999 524 L 961.3999 524 L 961.3999 524 Z" fill="#000000"/>		</g>	</g></svg>'); - background-size: auto 80%; - background-repeat: no-repeat; - background-position-x: 98%; - background-position-y: 50%; -} \ No newline at end of file diff --git a/src/app/styles/components/_header.less b/src/app/styles/components/_header.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/styles/components/_lineitems.less b/src/app/styles/components/_lineitems.less deleted file mode 100644 index 0212a303..00000000 --- a/src/app/styles/components/_lineitems.less +++ /dev/null @@ -1,3 +0,0 @@ -.modal_buttons { - margin-bottom: 50px; -} \ No newline at end of file diff --git a/src/app/styles/components/_shipping.less b/src/app/styles/components/_shipping.less deleted file mode 100644 index f49cd673..00000000 --- a/src/app/styles/components/_shipping.less +++ /dev/null @@ -1,4 +0,0 @@ -#address_paragraph { - white-space: pre; - padding-top: 10px; -} \ No newline at end of file diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index 25d5f381..757f004e 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -1,11 +1,6 @@ -@import '_account'; -@import '_buyer-select'; @import '_catalog-card'; -@import '_catalog-facets'; @import '_category-tree'; @import '_datepicker'; -@import '_header'; -@import '_lineitems'; @import '_loading-indicators'; @import '_modals'; @import '_navbar'; @@ -13,10 +8,8 @@ @import '_product-browse'; @import '_product-search'; @import '_quantity-input'; -@import '_shipping'; @import '_sidebar'; @import '_tables'; @import '_toastr'; @import '_tree'; @import '_typeahead'; -@import '_creditcard'; diff --git a/src/app/styles/pages/_catalog.less b/src/app/styles/pages/_catalog.less deleted file mode 100644 index 2395c3b3..00000000 --- a/src/app/styles/pages/_catalog.less +++ /dev/null @@ -1,64 +0,0 @@ -#catalog-wrapper { - padding-left: 0; - transition: all 0.5s ease; - &.toggled { - padding-left: @aside-tree-width; - #catalog-aside { - width: @aside-tree-width; - } - #catalog-view { - position: absolute; - margin-right: -@aside-tree-width; - } - } -} - -#catalog-view { - > button { - margin-bottom: 5px; - } -} - -#catalog-aside { - z-index: 999; - position: fixed; - width: 0; - height: 100%; - margin-left: -@aside-tree-width; - margin-top: -20px; - overflow-y: auto; - overflow-x:hidden; - transition: all 0.5s ease; - padding: 15px; -} - -#catalog-view { - width: 100%; - padding-left: 30px; - position: absolute; -} - -@media(min-width:768px) { - #catalog-wrapper { - padding-left: @aside-tree-width; - &.toggled { - padding-left: 0; - #catalog-aside { - width: 0; - } - #catalog-view { - position: relative; - margin-right: 0; - } - } - } - - #catalog-aside { - width: @aside-tree-width; - } - - #catalog-view { - position: relative; - } -} - diff --git a/src/app/styles/pages/_category-list.less b/src/app/styles/pages/_category-list.less deleted file mode 100644 index f7000179..00000000 --- a/src/app/styles/pages/_category-list.less +++ /dev/null @@ -1,69 +0,0 @@ -.product-list { - > div { - padding: 5px 10px; - .product-item { - height: 400px; - display: flex; - flex-flow: column; - align-items: center; - //border: solid black 1px; - padding: 10px; - //box-shadow: 10px 10px 15px -5px rgba(0,0,0,0.75); - .thumbnail-image { - display: flex; - align-items: center; - flex-grow: 1; - img { - max-width: 100%; - max-height: 200px; - } - } - } - .product-item:hover { - //box-shadow: 10px 10px 10px -5px rgba(0,0,0,0.75); - } - .item-description { - margin: 10px 0 0; - max-height: 75px; - overflow: hidden; - p { - width: 100%; - text-overflow: ellipsis; - } - } - } -} - -#catalog-tree { - ul { - margin-left : 20px; - } - > ul { - margin-left: 0px; - } -} - -.category-list { - display:flex; - flex-flow:row wrap; - justify-content:center; - margin:0 -15px; - .category-list-item { - flex:0 1 auto; - padding:0 15px; - } - figure { - overflow:hidden; - background-color:@table-bg-accent; - } - img { - margin:0 auto; - } - h4 { - margin:0 auto; - max-width:300px; - overflow:hidden; - white-space: nowrap; - text-overflow: ellipsis; - } -} \ No newline at end of file diff --git a/src/app/styles/pages/_checkout.less b/src/app/styles/pages/_checkout.less deleted file mode 100644 index 967add40..00000000 --- a/src/app/styles/pages/_checkout.less +++ /dev/null @@ -1,35 +0,0 @@ -#checkout_nav { - padding-bottom: 20px; -} - -#LineItems { - .table { - margin-bottom: 0; - .item_info { - border-bottom: none; - } - .shipping_info { - td { - border-top: none; - } - border-top: none; - } - } - tr{ - &:first-child { - > td { - border-top:none; - } - } - } -} - -@media print { - main { - margin-left: -250px!important; - } -} - -.add-payment { - margin-top: 10px; -} \ No newline at end of file diff --git a/src/app/styles/pages/_home.less b/src/app/styles/pages/_home.less deleted file mode 100644 index 874be788..00000000 --- a/src/app/styles/pages/_home.less +++ /dev/null @@ -1,3 +0,0 @@ -#COMPONENT_Home { - padding-top:15px; -} \ No newline at end of file diff --git a/src/app/styles/pages/_my-orders.less b/src/app/styles/pages/_my-orders.less deleted file mode 100644 index 0a57183f..00000000 --- a/src/app/styles/pages/_my-orders.less +++ /dev/null @@ -1,3 +0,0 @@ -.payment-item { - height: 115px; -} \ No newline at end of file diff --git a/src/app/styles/pages/glob.less b/src/app/styles/pages/glob.less index bf9df75f..32f370f7 100644 --- a/src/app/styles/pages/glob.less +++ b/src/app/styles/pages/glob.less @@ -1,7 +1,2 @@ @import '_cart'; -@import '_catalog'; -@import '_category-list'; -@import '_checkout'; -@import '_home'; @import '_login'; -@import '_my-orders'; \ No newline at end of file From 05f50cbb502c6a6515775d4252817a93973b5adb Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Tue, 18 Apr 2017 16:13:56 -0500 Subject: [PATCH 107/158] Create consistent nav items for all breakpoints * Add mobile search functionality * Delete commented out code * Add class for hiding nav items on desktop * Fix white-space bug on typeahead match --- src/app/base/templates/base.html | 10 ++-- .../templates/product-search-popup.html | 1 - .../templates/productSearch.component.html | 46 +------------------ src/app/styles/components/_typeahead.less | 6 +++ src/app/styles/shame.less | 13 ++++-- 5 files changed, 23 insertions(+), 53 deletions(-) diff --git a/src/app/base/templates/base.html b/src/app/base/templates/base.html index 264c3a03..26362680 100644 --- a/src/app/base/templates/base.html +++ b/src/app/base/templates/base.html @@ -1,8 +1,9 @@ +<!--TODO: is it necessary to have nav in separate file?--> <!--<header> <div ui-view="nav"></div> </header>--> <!--Navmenu is used on smaller viewports--> -<nav class="navmenu navmenu-default navmenu-fixed-left offcanvas"> +<nav class="navmenu navmenu-default navmenu-fixed-left offcanvas c-mobile-nav"> <a class="navmenu-brand" ui-sref="home">{{application.name}}</a> <ul class="nav navmenu-nav"> <li> @@ -57,10 +58,11 @@ <a ui-sref="categoryBrowse({page:'', sortBy:'', categoryID:''})">Category Browse</a> </li> </ul> - <form class="navbar-form navbar-left c-desktop-nav"> - <ordercloud-product-search></ordercloud-product-search> - </form> + <ordercloud-product-search class="navbar-form navbar-left c-desktop-nav"></ordercloud-product-search> <ul class="nav navbar-nav navbar-right"> + <li class="c-mobile-nav"> + <a href="" ng-click="base.mobileSearch()"><i class="fa fa-search"></i></a> + </li> <li> <a ui-sref="cart"><i class="fa fa-shopping-cart"></i> <span class="sr-only">Shopping Cart</span> <span class="badge" ng-bind="base.currentOrder.LineItemCount"></span></a> </li> diff --git a/src/app/productSearch/templates/product-search-popup.html b/src/app/productSearch/templates/product-search-popup.html index 1b461252..9c9906f6 100644 --- a/src/app/productSearch/templates/product-search-popup.html +++ b/src/app/productSearch/templates/product-search-popup.html @@ -1,4 +1,3 @@ -<!--<ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" ng-style="{top: position().top+'px', left: position().left+'px'}" role="listbox" aria-hidden="{{!isOpen()}}">--> <ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" role="listbox" aria-hidden="{{!isOpen()}}"> <li class="uib-typeahead-match" ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index, $event)" role="option" id="{{::match.id}}"> <div uib-typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div> diff --git a/src/app/productSearch/templates/productSearch.component.html b/src/app/productSearch/templates/productSearch.component.html index c2621898..614511c9 100644 --- a/src/app/productSearch/templates/productSearch.component.html +++ b/src/app/productSearch/templates/productSearch.component.html @@ -17,10 +17,10 @@ typeahead-template-url="productSearch/templates/product-search-match.html" /> <span class="input-group-btn"> - <button class="btn btn-default" type="button"><i class="fa fa-search"></i></button> + <button class="btn btn-default" type="submit" value="Search"><i class="fa fa-search"></i></button> </span> </div> - <!-- Typeahead Loading / No Results --> + <!-- Typeahead Results --> <div class="c-typeahead__results"> <div class="c-typeahead__results--empty" ng-if="$ctrl.searchTerm && noResults"> <span>No matches found</span> @@ -38,45 +38,3 @@ </div> </div> </form> - -<!--<form name="OrderCloudProductSearch" class="c-productsearch c-typeahead" ng-submit="$ctrl.onHardEnter($ctrl.searchTerm)" pretty-submit>--> - <!-- Typeahead Result Template --> - <!--<script type="text/ng-template" id="oc-product-search-result.html"> - <a href tabindex="-1" ng-attr-title="{{match.label}}"> - <span ng-bind-html="'<b>' + (match.model.Name | uibTypeaheadHighlight:query) + '</b>' + '<br/><small>' + (match.model.ID | uibTypeaheadHighlight:query) + '</small>'"></span> - </a> - </script> - <div class="form-group" ng-class="{open:noResults}"> - <input type="search" - class="form-control" - placeholder="Search Products..." - ng-model="$ctrl.searchTerm" - uib-typeahead="product as product.Name for product in $ctrl.getSearchResults()" - disable-validation-message - typeahead-append-to="'.c-typeahead__results'" - typeahead-on-select="$ctrl.onSelect($item.ID)" - typeahead-focus-first="false" - typeahead-wait-ms="300" - typeahead-no-results="noResults" - typeahead-loading="loading" - typeahead-template-url="oc-product-search-result.html" - /> - <button class="sr-only" type="submit" value="Search"></button> - <div class="c-typeahead__results"> - <div class="c-typeahead__results--empty" ng-if="$ctrl.searchTerm && noResults"> - <span>No matches found</span> - </div> - <div class="c-typeahead__results--loading" ng-if="loading"> - <div class="indicator-container"> - <div class="indicator"> - <div class="animation"> - <div class="dot"></div> - <div class="dot"></div> - <div class="dot"></div> - </div> - </div> - </div> - </div> - </div> - </div> -</form>--> diff --git a/src/app/styles/components/_typeahead.less b/src/app/styles/components/_typeahead.less index 511be254..df185c63 100644 --- a/src/app/styles/components/_typeahead.less +++ b/src/app/styles/components/_typeahead.less @@ -5,6 +5,12 @@ // display results .dropdown-menu { right: 0; + // Boostrap override + > li { + > a { + white-space: normal; + } + } } // display empty and loading modifier states in a dropdown UI to match typeahead results &--empty, diff --git a/src/app/styles/shame.less b/src/app/styles/shame.less index 7a6e5c20..23fb6699 100644 --- a/src/app/styles/shame.less +++ b/src/app/styles/shame.less @@ -43,7 +43,7 @@ li a, text-align:center; } -// Overriding default bootstrap behavior - we aren't using the default nav collapse UX +// Overriding default bootstrap navbar behavior - we aren't using the default nav collapse UX .navbar-header, .navbar-nav > li { float: left; @@ -61,10 +61,15 @@ li a, float: left; margin-left: @navbar-padding-horizontal; } -// Hiding certain nav elements on smaller viewports -// TODO: refactor this class and its functionality +// Hiding/showing specific nav elements on smaller viewports +// TODO: refactor these classes +.c-mobile-nav { + @media (min-width: @grid-float-breakpoint-max) { + display: none!important; + } +} .c-desktop-nav { @media (max-width: @grid-float-breakpoint-max) { - display: none; + display: none!important; } } \ No newline at end of file From 3655b4011490000533297c589c3b630ddc2ec24d Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Wed, 19 Apr 2017 14:56:55 -0500 Subject: [PATCH 108/158] Add logo display elements and classes OC-2110 --- src/app/base/templates/base.html | 5 ++++- src/app/styles/components/_logo-display.less | 16 ++++++++++++++++ src/app/styles/components/glob.less | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/app/styles/components/_logo-display.less diff --git a/src/app/base/templates/base.html b/src/app/base/templates/base.html index 26362680..467afb51 100644 --- a/src/app/base/templates/base.html +++ b/src/app/base/templates/base.html @@ -48,7 +48,10 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" ui-sref="home">{{application.name}}</a> + <a class="navbar-brand" ui-sref="home" ng-if="!application.logoUrl">{{application.name}}</a> + <a class="c-logo-display c-logo-display__nav" ng-if="application.logoUrl" ui-sref="home"> + <img ng-src="{{application.logoUrl}}" alt="{{application.name}}"> + </a> </div> <ul class="nav navbar-nav c-desktop-nav"> <li> diff --git a/src/app/styles/components/_logo-display.less b/src/app/styles/components/_logo-display.less new file mode 100644 index 00000000..51f0d8b7 --- /dev/null +++ b/src/app/styles/components/_logo-display.less @@ -0,0 +1,16 @@ +.c-logo-display { + text-align:center; + &.c-logo-display__login { + padding:@grid-gutter-width/2 0 @grid-gutter-width; + } + &.c-logo-display__nav { + padding: 2px @navbar-padding-horizontal; + img { + max-height:@navbar-height - 5px; + max-width:100%; + } + @media(max-width:@screen-xs-max) { + max-width:100px; + } + } +} \ No newline at end of file diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index 757f004e..1d27e8e5 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -2,6 +2,7 @@ @import '_category-tree'; @import '_datepicker'; @import '_loading-indicators'; +@import '_logo-display'; @import '_modals'; @import '_navbar'; @import '_navmenu'; From 7dcc9b67e5b55d27c2b3f8d126e35811b4879929 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Thu, 20 Apr 2017 14:02:18 -0500 Subject: [PATCH 109/158] Remove and refactor concatenated classes OC-2057 --- src/app/styles/components/_catalog-card.less | 14 +++--- src/app/styles/layout/_catalog-grid.less | 45 ++++++++++---------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/app/styles/components/_catalog-card.less b/src/app/styles/components/_catalog-card.less index 73595457..08f0c6dd 100644 --- a/src/app/styles/components/_catalog-card.less +++ b/src/app/styles/components/_catalog-card.less @@ -1,19 +1,19 @@ -.c-product-card { - @media (min-width: @screen-sm-min) { - // add flex display to product card wrapper - // flex the product card to fill the grid item element +@media (min-width: @screen-sm-min) { + .c-product-card { + // add flex display to product card wrapper + // flex the product card to fill the grid item element .oc-flex-layout.vertical; .oc-flex-layout.flex-auto; - &__body { + .c-product-card__body { .oc-flex-layout.vertical; .oc-flex-layout.flex-auto; } - // flex the descrip to push icons to bottom of card - &__descrip { + .c-product-card__name { .oc-flex-layout.flex-auto; } } } + .c-category-card { // add flex display to category card wrapper @media (min-width: @screen-sm-min) { diff --git a/src/app/styles/layout/_catalog-grid.less b/src/app/styles/layout/_catalog-grid.less index ff268f15..230b56cc 100644 --- a/src/app/styles/layout/_catalog-grid.less +++ b/src/app/styles/layout/_catalog-grid.less @@ -1,26 +1,17 @@ .l-product-grid { // use flexbox for layout on small+ screens // add flex display to product grid wrapper - margin-left: -5px; - margin-right: -5px; - @media (min-width: @screen-sm-min) { + margin-left: -@grid-gutter-width/6; + margin-right: -@grid-gutter-width/6; +} +@media (max-width: @screen-xs-max) { + .l-product-grid { .oc-flex-layout.horizontal; .oc-flex-layout.wrap; - // flex each item within the grid wrapper - &__item { - .oc-flex-layout.vertical; - padding-left: @grid-gutter-width/6; - padding-right: @grid-gutter-width/6; - } - } - @media (max-width: @screen-xs-max){ .thumbnail { border: none; } - .oc-flex-layout.horizontal; - .oc-flex-layout.wrap; - // flex each item within the grid wrapper - &__item { + .l-product-grid__item { .oc-flex-layout.vertical; padding-left: 2px; padding-right: 2px; @@ -29,19 +20,29 @@ } h4{ font-size: 12px; - } + } } } } -.l-category-grid { - // use flexbox for layout on small+ screens - // add flex display to product grid wrapper - @media (min-width: @screen-sm-min) { +@media (min-width: @screen-sm-min) { + .l-product-grid { .oc-flex-layout.horizontal; .oc-flex-layout.wrap; // flex each item within the grid wrapper - &__item { + .l-product-grid__item { .oc-flex-layout.vertical; - } + padding-left: @grid-gutter-width/6; + padding-right: @grid-gutter-width/6; + } + } + .l-category-grid { + // use flexbox for layout on small+ screens + // add flex display to product grid wrapper + .oc-flex-layout.horizontal; + .oc-flex-layout.wrap; + // flex each item within the grid wrapper + .l-category-grid__item { + .oc-flex-layout.vertical; + } } } From 5f8d9858c90c5a4d3f8451e7f691ca2f62da5724 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Thu, 20 Apr 2017 15:55:12 -0500 Subject: [PATCH 110/158] Add _creditcard.less file back to project OC-2060 --- src/app/styles/components/_creditcard.less | 28 ++++++++++++++++++++++ src/app/styles/components/glob.less | 1 + 2 files changed, 29 insertions(+) create mode 100644 src/app/styles/components/_creditcard.less diff --git a/src/app/styles/components/_creditcard.less b/src/app/styles/components/_creditcard.less new file mode 100644 index 00000000..16d252b1 --- /dev/null +++ b/src/app/styles/components/_creditcard.less @@ -0,0 +1,28 @@ +.visa { + background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjU5LjA1NXB4IiBoZWlnaHQ9IjIwMi4wNjlweCIgdmlld0JveD0iMCAwIDY1OS4wNTUgMjAyLjA2OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgNjU5LjA1NSAyMDIuMDY5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxnPg0KCTxnPg0KCQk8cG9seWdvbiBmaWxsPSIjMDAyNDlGIiBwb2ludHM9IjIzMi4xNzgsMTk5LjE2NCAyNjUuNTM5LDMuNDAyIDMxOC44OTgsMy40MDIgMjg1LjUxNCwxOTkuMTY0IAkJIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik00NzkuMDQsOC4yMjJDNDY4LjQ2OCw0LjI1Niw0NTEuOTA0LDAsNDMxLjIxNywwYy01Mi43MjQsMC04OS44NjMsMjYuNTUyLTkwLjE4LDY0LjYwNA0KCQkJYy0wLjI5NywyOC4xMjksMjYuNTE0LDQzLjgyLDQ2Ljc1NCw1My4xODVjMjAuNzcsOS41OTUsMjcuNzUyLDE1LjcxNSwyNy42NTIsMjQuMjgzYy0wLjEzMSwxMy4xMjItMTYuNTg2LDE5LjExNy0zMS45MjIsMTkuMTE3DQoJCQljLTIxLjM1NywwLTMyLjcwMy0yLjk2Ny01MC4yMjctMTAuMjc2bC02Ljg3Ni0zLjExMWwtNy40ODksNDMuODIzYzEyLjQ2Miw1LjQ2NCwzNS41MDksMTAuMTk5LDU5LjQzOCwxMC40NDQNCgkJCWM1Ni4wODksMCw5Mi41MDEtMjYuMjQ3LDkyLjkxNS02Ni44ODJjMC4yMDEtMjIuMjctMTQuMDE2LTM5LjIxNy00NC43OTktNTMuMTg4Yy0xOC42NTEtOS4wNTYtMzAuMDczLTE1LjA5OS0yOS45NTItMjQuMjY5DQoJCQljMC04LjEzNyw5LjY2OC0xNi44MzgsMzAuNTU3LTE2LjgzOGMxNy40NDktMC4yNzEsMzAuMDg4LDMuNTM0LDM5LjkzNyw3LjVsNC43ODEsMi4yNTlMNDc5LjA0LDguMjIyIi8+DQoJCTxwYXRoIGZpbGw9IiMwMDI0OUYiIGQ9Ik02MTUuODY3LDMuNTg5aC00MS4yMzFjLTEyLjc3MiwwLTIyLjMzMSwzLjQ4Ni0yNy45NCwxNi4yMzRMNDY3LjQ1LDE5OS4yMjZoNTYuMDMxDQoJCQljMCwwLDkuMTYxLTI0LjEyMiwxMS4yMzMtMjkuNDE4YzYuMTIzLDAsNjAuNTU1LDAuMDg0LDY4LjMzNiwwLjA4NGMxLjU5Nyw2Ljg1Myw2LjQ5MiwyOS4zMzQsNi40OTIsMjkuMzM0aDQ5LjUxMkw2MTUuODY3LDMuNTg5DQoJCQkgTTU1MC4wNywxMjkuNzY3YzQuNDEzLTExLjI3OSwyMS4yNTktNTQuNzI0LDIxLjI1OS01NC43MjRjLTAuMzE1LDAuNTIxLDQuMzgtMTEuMzM0LDcuMDc1LTE4LjY4NGwzLjYwNiwxNi44NzgNCgkJCWMwLDAsMTAuMjE3LDQ2LjcyOSwxMi4zNTMsNTYuNTI4TDU1MC4wNywxMjkuNzY3TDU1MC4wNywxMjkuNzY3eiIvPg0KCQk8cGF0aCBmaWxsPSIjMDAyNDlGIiBkPSJNMTg3LjQyNSwzLjU0NWwtNTIuMjQsMTMzLjQ5NWwtNS41NjYtMjcuMTI5Yy05LjcyNS0zMS4yNzMtNDAuMDI1LTY1LjE1Ni03My44OTktODIuMTE5bDQ3Ljc2NywxNzEuMjAzDQoJCQlsNTYuNDU1LTAuMDY0TDI0My45NDYsMy41NDVIMTg3LjQyNSIvPg0KCQk8cGF0aCBmaWxsPSIjRkZBMDAwIiBkPSJNODYuNzIyLDMuNDI0SDAuNjgxTDAsNy40OTdDNjYuOTM5LDIzLjcwMSwxMTEuMjMyLDYyLjg2LDEyOS42MTgsMTA5LjkxMWwtMTguNzA5LTg5Ljk2DQoJCQlDMTA3LjY3OSw3LjU1NSw5OC4zMTEsMy44NTYsODYuNzIyLDMuNDI0Ii8+DQoJPC9nPg0KPC9nPg0KPC9zdmc+DQo='); + background-size: auto 50%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.amex { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   version="1.1"
   width="281.89001"
   height="130.42363"
   viewBox="0 0 281.89001 130.42363"
   id="Layer_1"
   xml:space="preserve"><metadata
   id="metadata38"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs36" />
<radialGradient
   cx="57.388199"
   cy="57.021"
   r="264.57971"
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   gradientTransform="matrix(1.0010754,0,0,0.46091624,-7.6472151,-3.502043)">
	<stop
   id="stop4"
   style="stop-color:#9dd5f6;stop-opacity:1"
   offset="0" />
	<stop
   id="stop6"
   style="stop-color:#98d3f5;stop-opacity:1"
   offset="0.0711" />
	<stop
   id="stop8"
   style="stop-color:#89cef3;stop-opacity:1"
   offset="0.1575" />
	<stop
   id="stop10"
   style="stop-color:#70c6ef;stop-opacity:1"
   offset="0.2516" />
	<stop
   id="stop12"
   style="stop-color:#4ebbea;stop-opacity:1"
   offset="0.35139999" />
	<stop
   id="stop14"
   style="stop-color:#23ade3;stop-opacity:1"
   offset="0.45460001" />
	<stop
   id="stop16"
   style="stop-color:#0da6e0;stop-opacity:1"
   offset="0.5" />
	<stop
   id="stop18"
   style="stop-color:#2e77bc;stop-opacity:1"
   offset="1" />
</radialGradient>
<path
   d="M 282.24821,0 H 0 V 130.42363 H 282.24821 V 87.380507 c 1.1212,-0.74622 1.6748,-1.70078 1.6748,-2.86782 0,-1.33574 -0.5536,-2.16309 -1.6748,-2.86"
   id="path20"
   style="fill:url(#SVGID_1_)" />
<g
   transform="translate(-7.639,-88.953933)"
   id="g22">
	<defs
   id="defs24">
		<path
   d="M 289.584,7.598 H 7.639 v 282.966 h 281.945 v -93.386 c 1.12,-1.619 1.673,-3.69 1.673,-6.222 0,-2.898 -0.553,-4.693 -1.673,-6.205"
   id="SVGID_2_" />
	</defs>
	<clipPath
   id="SVGID_3_">
		<use
   id="use28"
   style="overflow:visible"
   x="0"
   y="0"
   width="300"
   height="300"
   xlink:href="#SVGID_2_" />
	</clipPath>
</g>
<path
   d="m 25.414,41.088067 -5.424,-13.217 -5.393,13.217 m 130.307,-5.263 c -1.089,0.661 -2.377,0.683 -3.92,0.683 h -9.627 v -7.364 h 9.758 c 1.381,0 2.822,0.062 3.758,0.598 1.028,0.483 1.664,1.511 1.664,2.931 0,1.449 -0.605,2.615 -1.633,3.152 z m 68.678,5.263 -5.484,-13.217 -5.454,13.217 h 10.938 z m -128.02,14.306 h -8.124 l -0.03,-25.966 -11.491,25.966 h -6.958 l -11.521,-25.989 v 25.989 H 31.32 l -3.045,-7.395 h -16.5 l -3.076,7.395 H 0.092 l 14.191,-33.154 h 11.774 l 13.478,31.39 v -31.39 h 12.934 l 10.371,22.491 9.527,-22.491 h 13.194 v 33.154 z m 32.379,0 H 91.468 v -33.154 h 26.473 v 6.904 H 99.393 v 5.976 h 18.103 v 6.796 H 99.393 v 6.621 h 18.548 v 6.857 z m 37.326,-24.225 c 0,5.286 -3.528,8.017 -5.584,8.837 1.734,0.66 3.215,1.826 3.92,2.792 1.119,1.649 1.312,3.122 1.312,6.083 v 6.513 h -7.993 l -0.03,-4.181 c 0,-1.995 0.191,-4.864 -1.251,-6.459 -1.158,-1.166 -2.923,-1.419 -5.776,-1.419 h -8.507 v 12.059 h -7.924 v -33.154 h 18.227 c 4.05,0 7.034,0.107 9.596,1.588 2.507,1.481 4.01,3.643 4.01,7.341 z m 12.682,24.225 h -8.086 v -33.154 h 8.086 v 33.154 z m 93.808,0 h -11.23 l -15.021,-24.884 v 24.884 h -16.139 l -3.084,-7.395 h -16.462 l -2.992,7.395 h -9.273 c -3.852,0 -8.729,-0.852 -11.491,-3.667 -2.785,-2.815 -4.234,-6.628 -4.234,-12.657 0,-4.917 0.866,-9.412 4.272,-12.964 2.562,-2.646 6.574,-3.866 12.035,-3.866 h 7.672 v 7.104 h -7.511 c -2.892,0 -4.525,0.43 -6.098,1.964 -1.351,1.396 -2.278,4.035 -2.278,7.51 0,3.552 0.706,6.113 2.179,7.786 1.22,1.312 3.437,1.71 5.523,1.71 h 3.559 l 11.169,-26.073 h 11.874 l 13.417,31.359 v -31.359 h 12.066 l 13.93,23.09 v -23.09 h 8.117 v 33.153 z M 0,61.906067 h 13.54 l 3.053,-7.364 h 6.835 l 3.045,7.364 h 26.641 v -5.63 l 2.378,5.654 h 13.83 l 2.378,-5.738 v 5.714 h 66.208 l -0.031,-12.088 h 1.281 c 0.897,0.031 1.159,0.114 1.159,1.595 v 10.493 h 34.243 v -2.814 c 2.762,1.48 7.058,2.814 12.711,2.814 h 14.406 l 3.083,-7.364 h 6.835 l 3.015,7.364 h 27.761 v -6.995 l 4.204,6.995 h 22.246 v -46.24 h -22.016 v 5.461 l -3.083,-5.461 h -22.591 v 5.461 l -2.831,-5.461 h -30.515 c -5.108,0 -9.598,0.713 -13.225,2.7 v -2.7 h -21.058 v 2.7 c -2.308,-2.048 -5.453,-2.7 -8.95,-2.7 H 67.619 l -5.162,11.943 -5.301,-11.943 H 32.924 v 5.461 l -2.662,-5.461 H 9.596 l -9.597,21.985 v 24.255 z"
   id="path30"
   style="fill:#ffffff" />
<path
   d="m 281.945,86.361067 h -14.443 c -1.442,0 -2.4,0.054 -3.207,0.599 -0.836,0.537 -1.158,1.334 -1.158,2.386 0,1.251 0.706,2.102 1.733,2.47 0.836,0.291 1.734,0.376 3.054,0.376 l 4.295,0.115 c 4.334,0.107 7.227,0.852 8.991,2.669 0.321,0.253 0.514,0.537 0.735,0.821 m 0,12.427003 c -1.925,2.815 -5.676,4.242 -10.754,4.242 h -15.304 v -7.111 h 15.242 c 1.512,0 2.57,-0.199 3.207,-0.821 0.552,-0.513 0.937,-1.258 0.937,-2.163 0,-0.966 -0.385,-1.733 -0.968,-2.193 -0.575,-0.506003 -1.412,-0.736003 -2.792,-0.736003 -7.441,-0.253 -16.724,0.23 -16.724,-10.264 0,-4.81 3.054,-9.873 11.37,-9.873 h 15.785 v -6.598 h -14.666 c -4.426,0 -7.641,1.06 -9.918,2.708 v -2.708 h -21.693 c -3.469,0 -7.541,0.86 -9.467,2.708 v -2.708 h -38.738 v 2.708 c -3.083,-2.224 -8.285,-2.708 -10.686,-2.708 h -25.552 v 2.708 c -2.439,-2.362 -7.863,-2.708 -11.169,-2.708 h -28.597 l -6.544,7.082 -6.129,-7.082 H 56.067 v 46.272003 h 41.914 l 6.743,-7.194 6.352,7.194 25.836,0.023 v -10.885 h 2.54 c 3.428,0.053 7.471,-0.085 11.038,-1.627 v 12.488 h 21.31 v -12.06 h 1.028 c 1.312,0 1.441,0.054 1.441,1.365 v 10.694 h 64.736 c 4.11,0 8.406,-1.052 10.785,-2.961 v 2.961 h 20.534 c 4.273,0 8.446,-0.599 11.621,-2.133 v -8.62 z M 250.334,94.976067 c 1.543,1.597 2.37,3.613 2.37,7.026003 0,7.134 -4.457,10.464 -12.449,10.464 H 224.82 v -7.111 h 15.373 c 1.503,0 2.569,-0.199 3.237,-0.821 0.545,-0.513 0.936,-1.258 0.936,-2.163 0,-0.966 -0.423,-1.733 -0.967,-2.193 -0.606,-0.506003 -1.442,-0.736003 -2.822,-0.736003 -7.411,-0.253 -16.692,0.23 -16.692,-10.264 0,-4.81 3.022,-9.873 11.33,-9.873 h 15.887 v 7.058 h -14.537 c -1.441,0 -2.378,0.054 -3.175,0.599 -0.868,0.537 -1.19,1.334 -1.19,2.386 0,1.251 0.737,2.102 1.734,2.47 0.836,0.291 1.734,0.376 3.084,0.376 l 4.266,0.115 c 4.302,0.105 7.255,0.849 9.05,2.667 z m -71.508,-2.048 c -1.06,0.629 -2.371,0.683 -3.913,0.683 h -9.627 v -7.448 h 9.758 c 1.411,0 2.823,0.03 3.782,0.599 1.027,0.537 1.641,1.564 1.641,2.983 0,1.419 -0.614,2.562 -1.641,3.183 z m 4.786,4.127 c 1.764,0.651 3.206,1.818 3.882,2.784 1.119,1.619003 1.281,3.130003 1.313,6.053003 v 6.574 h -7.956 v -4.149 c 0,-1.995 0.192,-4.949 -1.281,-6.491 -1.158,-1.188 -2.923,-1.472 -5.814,-1.472 h -8.469 v 12.112 h -7.963 V 79.304067 h 18.296 c 4.012,0 6.934,0.177 9.535,1.565 2.501,1.511 4.074,3.581 4.074,7.364 -0.001,5.293 -3.531,7.994 -5.617,8.822 z m 10.011,-17.751 h 26.449 v 6.858 h -18.557 v 6.029 h 18.104 v 6.766 h -18.104 v 6.598003 l 18.557,0.03 v 6.881 H 193.623 V 79.304067 z m -53.467,15.304 h -10.241 v -8.445 h 10.333 c 2.861,0 4.847,1.166 4.847,4.066 0,2.868 -1.894,4.379 -4.939,4.379 z m -18.134,14.842003 -12.167,-13.508003 12.167,-13.079 v 26.587003 z m -31.421,-3.895 H 71.117 v -6.598003 h 17.398 v -6.766 H 71.117 v -6.029 h 19.868 l 8.668,9.664 -9.052,9.729003 z m 63.002,-15.326003 c 0,9.212 -6.873,11.114003 -13.8,11.114003 h -9.888 v 11.123 h -15.403 l -9.758,-10.978 -10.141,10.978 H 63.223 V 79.304067 h 31.873 l 9.75,10.87 10.08,-10.87 h 25.322 c 6.289,0 13.355,1.741 13.355,10.925 z"
   id="path32"
   style="fill:#ffffff" />
</svg>'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.mastercard { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 width="300px" height="180px" viewBox="0 0 300 180" style="enable-background:new 0 0 300 180;" xml:space="preserve">
<g id="layer1">
	<g id="g10305">
		<path id="path2268" style="fill:#FF9900;" d="M298.032,90.5c0.014,48.936-39.646,88.614-88.582,88.627
			c-48.937,0.012-88.614-39.646-88.627-88.582c0-0.016,0-0.029,0-0.045c-0.013-48.935,39.647-88.615,88.581-88.628
			c48.937-0.013,88.615,39.647,88.628,88.583C298.032,90.47,298.032,90.484,298.032,90.5z"/>
		<path id="path1350" style="fill:#CC0000;" d="M90.001,1.895C41.355,2.204,1.967,41.781,1.967,90.5
			c0,48.909,39.695,88.604,88.605,88.604c22.955,0,43.879-8.748,59.624-23.086c-0.001,0-0.003-0.002-0.007-0.004h0.019
			c3.224-2.938,6.231-6.108,8.995-9.488H141.05c-2.424-2.928-4.627-5.979-6.606-9.127h31.308c1.904-3.047,3.628-6.211,5.158-9.488
			h-41.635c-1.419-3.042-2.651-6.153-3.703-9.309h49.045c2.956-8.832,4.56-18.281,4.56-28.103c0-6.512-0.706-12.861-2.042-18.974
			h-54.164c0.671-3.146,1.518-6.254,2.528-9.308h49.063c-1.097-3.25-2.371-6.417-3.82-9.487H129.27
			c1.496-3.196,3.191-6.305,5.084-9.307h31.285c-2.082-3.317-4.386-6.486-6.877-9.488h-17.443c2.697-3.174,5.666-6.163,8.889-8.95
			c-15.746-14.34-36.676-23.09-59.636-23.09C90.381,1.895,90.192,1.894,90.001,1.895z"/>
		<path id="use9412" style="fill:#FCB340;" d="M289.143,136.82c0.482,0,0.951,0.125,1.409,0.371c0.46,0.246,0.814,0.601,1.07,1.062
			c0.256,0.456,0.384,0.937,0.384,1.435c0,0.492-0.127,0.968-0.379,1.424c-0.251,0.455-0.605,0.81-1.061,1.063
			c-0.451,0.249-0.928,0.375-1.424,0.375s-0.972-0.126-1.426-0.375c-0.455-0.254-0.807-0.607-1.063-1.063
			c-0.252-0.456-0.377-0.932-0.377-1.424c0-0.498,0.127-0.979,0.384-1.435c0.258-0.461,0.614-0.813,1.071-1.062
			C288.193,136.945,288.662,136.82,289.143,136.82 M289.143,137.295c-0.401,0-0.793,0.104-1.176,0.311
			c-0.38,0.207-0.677,0.5-0.891,0.888c-0.217,0.382-0.325,0.778-0.325,1.194c0,0.412,0.106,0.81,0.315,1.188
			c0.214,0.377,0.51,0.673,0.888,0.885c0.381,0.211,0.776,0.315,1.188,0.315c0.414,0,0.81-0.104,1.189-0.315
			c0.378-0.212,0.673-0.508,0.884-0.885c0.209-0.378,0.313-0.775,0.313-1.188c0-0.416-0.106-0.813-0.321-1.194
			c-0.213-0.388-0.511-0.681-0.894-0.888C289.934,137.398,289.544,137.295,289.143,137.295 M287.887,141.27v-3.082h1.062
			c0.36,0,0.622,0.028,0.784,0.088c0.162,0.057,0.291,0.154,0.388,0.297c0.095,0.141,0.144,0.291,0.144,0.451
			c0,0.226-0.08,0.422-0.242,0.588c-0.158,0.166-0.373,0.261-0.639,0.281c0.109,0.045,0.196,0.102,0.264,0.164
			c0.125,0.12,0.275,0.323,0.455,0.61l0.375,0.603h-0.606l-0.272-0.485c-0.215-0.382-0.388-0.62-0.521-0.718
			c-0.091-0.069-0.224-0.105-0.397-0.105h-0.293v1.311h-0.5 M288.385,139.535h0.604c0.288,0,0.483-0.044,0.588-0.129
			c0.106-0.088,0.159-0.2,0.159-0.342c0-0.092-0.024-0.174-0.075-0.244c-0.052-0.073-0.122-0.125-0.213-0.162
			c-0.089-0.035-0.255-0.055-0.497-0.055h-0.564v0.932"/>
	</g>
	<g id="g16480">
		<g id="g13802" transform="translate(-13.74405,15.9939)">
			<path id="path13804" style="fill:#000066;" d="M133.719,99.926l1.18-8.02c-0.645,0-1.593,0.279-2.431,0.279
				c-3.284,0-3.694-1.755-3.436-3.037l3.236-16.13h4.992l1.029-9.103h-4.705l0.958-5.516H124.7
				c-0.208,0.208-5.568,31.022-5.568,34.776c0,5.555,3.118,8.027,7.516,7.988C130.09,101.134,132.773,100.181,133.719,99.926z"/>
			<path id="path13806" style="fill:#000066;" d="M136.706,84.638c0,13.332,8.799,16.499,16.297,16.499
				c6.921,0,10.55-1.604,10.55-1.604l1.662-9.1c0,0-5.848,2.378-10.601,2.378c-10.131,0-8.355-7.554-8.355-7.554l19.463,0.059
				c0,0,1.239-6.111,1.239-8.602c0-6.217-3.387-13.849-13.745-13.849C143.73,62.867,136.706,73.088,136.706,84.638z M153.252,71.313
				c5.324,0,4.342,5.984,4.342,6.469H147.12C147.12,77.162,148.109,71.313,153.252,71.313z"/>
			<path id="path13808" style="fill:#000066;" d="M212.99,99.923l1.689-10.284c0,0-4.632,2.321-7.807,2.321
				c-6.693,0-9.378-5.11-9.378-10.601c0-11.137,5.758-17.265,12.168-17.265c4.808,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-4.554-3.289-9.456-3.308c-14.745-0.058-23.182,10.208-23.182,27.955c0,11.763,6.248,19.768,17.506,19.768
				C207.918,101.215,212.99,99.923,212.99,99.923z"/>
			<path id="path13810" style="fill:#000066;" d="M81.83,63.012c-6.469,0-11.427,2.079-11.427,2.079l-1.37,8.127
				c0,0,4.093-1.663,10.281-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.314,2.374-0.314,2.374s-2.772-0.231-4.056-0.231
				c-9.21,0-16.729,3.482-16.729,13.98c0,8.273,5.623,10.17,9.108,10.17c6.657,0,9.292-4.203,9.444-4.215l-0.077,3.488
				c0,0,8.306,0,8.307,0l3.706-25.98C94.786,63.366,85.17,63.012,81.83,63.012z M83.268,84.108c0.181,1.586-0.41,9.086-6.092,9.086
				c-2.93,0-3.691-2.24-3.691-3.562c0-2.584,1.403-5.683,8.315-5.683C83.41,83.949,82.997,84.065,83.268,84.108z"/>
			<path id="path13812" style="fill:#000066;" d="M103.615,100.906c2.125,0,14.272,0.541,14.272-11.994
				c0-11.721-11.244-9.404-11.244-14.114c0-2.342,1.833-3.08,5.184-3.08c1.329,0,6.447,0.423,6.447,0.423l1.189-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.802,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.287-5.844,3.287c-4.401,0-8.363-1.511-8.377-1.438l-1.259,8.245C93.257,99.819,95.702,100.906,103.615,100.906z"
				/>
			<path id="path13814" style="fill:#000066;" d="M290.807,55.455l-1.705,12.709c0,0-3.553-4.905-9.112-4.905
				c-10.459,0-15.849,10.423-15.849,22.396c0,7.73,3.844,15.307,11.699,15.307c5.651,0,8.784-3.941,8.784-3.941l-0.415,3.365h9.178
				l7.207-44.862L290.807,55.455z M286.755,80.156c0,4.983-2.468,11.64-7.581,11.64c-3.396,0-4.988-2.851-4.988-7.324
				c0-7.315,3.285-12.14,7.432-12.14C285.012,72.332,286.755,74.662,286.755,80.156z"/>
			<path id="path13816" style="fill:#000066;" d="M30.749,100.423l5.743-33.87l0.844,33.87h6.499l12.125-33.87l-5.371,33.87h9.658
				l7.437-44.922l-15.342-0.117l-9.126,27.504l-0.25-27.387h-14.06l-7.544,44.922H30.749L30.749,100.423z"/>
			<path id="path13818" style="fill:#000066;" d="M176.101,100.487c2.746-15.615,3.724-27.947,11.732-25.393
				c1.15-6.044,3.891-11.3,5.143-13.858c0,0-0.396-0.589-2.871-0.589c-4.225,0-9.866,8.574-9.866,8.574l0.843-5.301h-8.786
				l-5.884,36.566H176.101z"/>
			<g id="use14699" transform="translate(845.3001,0)">
				<path id="path13810_1_" style="fill:#000066;" d="M-612.55,63.012c-6.472,0-11.43,2.079-11.43,2.079l-1.369,8.127
					c0,0,4.095-1.663,10.28-1.663c3.514,0,6.083,0.395,6.083,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.231-4.055-0.231
					c-9.211,0-16.729,3.482-16.729,13.98c0,8.273,5.622,10.17,9.107,10.17c6.655,0,9.292-4.203,9.443-4.215l-0.078,3.488h8.309
					l3.705-25.98C-599.596,63.366-609.212,63.012-612.55,63.012z M-611.114,84.108c0.18,1.586-0.411,9.086-6.092,9.086
					c-2.932,0-3.692-2.24-3.692-3.562c0-2.584,1.402-5.683,8.315-5.683C-610.972,83.949-611.384,84.065-611.114,84.108z"/>
			</g>
			<path id="use14701" style="fill:#000066;" d="M255.266,100.487c1.508-11.488,4.299-27.616,11.731-25.393
				c1.149-6.044,0.041-6.028-2.433-6.028c-4.228,0-5.164,0.154-5.164,0.154l0.844-5.301h-8.785l-5.884,36.567H255.266
				L255.266,100.487z"/>
		</g>
		<g id="g10289">
			<path id="path4157" style="fill:#FFFFFF;" d="M122.434,113.059l1.181-8.019c-0.645,0-1.594,0.276-2.431,0.276
				c-3.284,0-3.646-1.746-3.437-3.037l2.653-16.362h4.991l1.205-8.87h-4.706l0.958-5.516h-9.434
				c-0.208,0.208-5.569,31.023-5.569,34.775c0,5.555,3.119,8.029,7.517,7.989C118.806,114.266,121.488,113.313,122.434,113.059z"/>
			<path id="path4155" style="fill:#FFFFFF;" d="M125.423,97.77c0,13.332,8.8,16.5,16.297,16.5c6.92,0,9.965-1.547,9.965-1.547
				l1.662-9.099c0,0-5.264,2.319-10.018,2.319c-10.13,0-8.356-7.553-8.356-7.553h19.172c0,0,1.238-6.113,1.238-8.604
				c0-6.216-3.094-13.79-13.452-13.79C132.445,75.998,125.423,86.219,125.423,97.77z M141.967,84.445
				c5.324,0,4.342,5.983,4.342,6.467h-10.474C135.835,90.294,136.825,84.445,141.967,84.445z"/>
			<path id="path4151" style="fill:#FFFFFF;" d="M201.707,113.055l1.688-10.285c0,0-4.629,2.321-7.806,2.321
				c-6.692,0-9.376-5.11-9.376-10.6c0-11.137,5.758-17.264,12.168-17.264c4.807,0,8.665,2.699,8.665,2.699l1.54-9.993
				c0,0-5.721-2.315-10.625-2.315c-10.891,0-21.486,9.448-21.486,27.192c0,11.766,5.721,19.537,16.979,19.537
				C196.637,114.348,201.707,113.055,201.707,113.055z"/>
			<path id="path4149" style="fill:#FFFFFF;" d="M70.547,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.369,8.127
				c0,0,4.093-1.663,10.28-1.663c3.513,0,6.083,0.395,6.083,3.25c0,1.734-0.315,2.374-0.315,2.374s-2.771-0.232-4.054-0.232
				c-8.159,0-16.73,3.482-16.73,13.98c0,8.272,5.623,10.17,9.108,10.17c6.656,0,9.525-4.319,9.678-4.332l-0.311,3.605h8.307
				l3.706-25.981C83.502,76.498,73.887,76.143,70.547,76.143z M72.568,97.297c0.18,1.587-0.995,9.026-6.675,9.026
				c-2.93,0-3.692-2.238-3.692-3.562c0-2.582,1.403-5.682,8.316-5.682C72.125,97.081,72.297,97.253,72.568,97.297z"/>
			<path id="path4145" style="fill:#FFFFFF;" d="M92.331,114.038c2.125,0,14.273,0.54,14.273-11.995
				c0-11.719-11.245-9.404-11.245-14.112c0-2.344,1.833-3.082,5.183-3.082c1.33,0,6.447,0.423,6.447,0.423l1.19-8.33
				c0,0.001-3.312-0.741-8.704-0.741c-6.979,0-14.063,2.786-14.063,12.318c0,10.801,11.812,9.717,11.812,14.267
				c0,3.037-3.3,3.284-5.843,3.284c-4.401,0-8.364-1.51-8.378-1.438l-1.258,8.246C81.973,112.948,84.417,114.038,92.331,114.038z"/>
			<path id="path4139" style="fill:#FFFFFF;" d="M279.852,68.668l-2.035,12.627c0,0-3.551-4.905-9.11-4.905
				c-8.644,0-15.849,10.422-15.849,22.397c0,7.73,3.843,15.304,11.699,15.304c5.651,0,8.784-3.94,8.784-3.94l-0.415,3.365h9.176
				l7.207-44.863L279.852,68.668z M275.471,93.288c0,4.983-2.467,11.639-7.582,11.639c-3.395,0-4.986-2.85-4.986-7.323
				c0-7.314,3.285-12.14,7.43-12.14C273.729,85.463,275.471,87.796,275.471,93.288z"/>
			<path id="path4133" style="fill:#FFFFFF;" d="M19.466,113.555l5.743-33.87l0.843,33.87h6.5l12.125-33.87l-5.371,33.87h9.658
				l7.438-44.923H41.467l-9.301,27.563l-0.484-27.563H17.915l-7.545,44.923H19.466z"/>
			<path id="path4131" style="fill:#FFFFFF;" d="M164.818,113.617c2.746-15.616,3.255-28.296,9.808-25.975
				c1.147-6.044,2.254-8.382,3.506-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
				l-5.885,36.567H164.818z"/>
			<g id="use8523" transform="translate(847.0062,0)">
				<path id="path4149_1_" style="fill:#FFFFFF;" d="M-623.531,76.143c-6.469,0-11.428,2.079-11.428,2.079l-1.368,8.127
					c0,0,4.093-1.663,10.28-1.663c3.513,0,6.081,0.395,6.081,3.25c0,1.734-0.313,2.374-0.313,2.374s-2.771-0.232-4.055-0.232
					c-8.158,0-16.729,3.482-16.729,13.98c0,8.272,5.622,10.17,9.107,10.17c6.656,0,9.525-4.319,9.677-4.332l-0.309,3.605
					c0,0,8.304,0,8.307,0l3.705-25.981C-610.575,76.498-620.191,76.143-623.531,76.143z M-621.507,97.297
					c0.18,1.587-0.996,9.026-6.678,9.026c-2.93,0-3.69-2.238-3.69-3.562c0-2.582,1.403-5.682,8.315-5.682
					C-621.952,97.081-621.781,97.253-621.507,97.297z"/>
			</g>
			<g id="use8525" transform="translate(442.2857,0)">
				<path id="path4131_1_" style="fill:#FFFFFF;" d="M-198.263,113.617c2.747-15.616,3.256-28.296,9.807-25.975
					c1.149-6.044,2.257-8.382,3.508-10.94c0,0-0.587-0.123-1.819-0.123c-4.225,0-7.355,5.772-7.355,5.772l0.841-5.301h-8.784
					l-5.885,36.567H-198.263z"/>
			</g>
			<path id="text9407" style="fill:#FFFFFF;" d="M289.105,107.975c0.479,0,0.951,0.123,1.406,0.373
				c0.459,0.242,0.816,0.598,1.072,1.059c0.257,0.458,0.383,0.935,0.383,1.434c0,0.493-0.126,0.969-0.379,1.424
				c-0.251,0.455-0.604,0.812-1.059,1.063c-0.454,0.25-0.93,0.376-1.424,0.376c-0.498,0-0.974-0.126-1.429-0.376
				c-0.454-0.253-0.806-0.608-1.058-1.063c-0.256-0.455-0.381-0.931-0.381-1.424c0-0.499,0.127-0.976,0.384-1.434
				c0.258-0.461,0.616-0.815,1.073-1.059C288.154,108.098,288.626,107.975,289.105,107.975 M289.105,108.447
				c-0.401,0-0.793,0.104-1.176,0.313c-0.382,0.204-0.679,0.499-0.894,0.885c-0.214,0.381-0.322,0.78-0.322,1.194
				s0.104,0.81,0.313,1.188c0.213,0.377,0.509,0.673,0.891,0.886c0.378,0.208,0.773,0.313,1.188,0.313
				c0.412,0,0.81-0.105,1.188-0.313c0.378-0.213,0.674-0.509,0.884-0.886c0.211-0.381,0.314-0.774,0.314-1.188
				s-0.107-0.813-0.321-1.194c-0.213-0.386-0.51-0.681-0.894-0.885C289.896,108.552,289.507,108.447,289.105,108.447
				 M287.85,112.423v-3.083h1.061c0.361,0,0.625,0.029,0.785,0.088c0.162,0.055,0.289,0.154,0.388,0.297
				c0.097,0.142,0.146,0.291,0.146,0.451c0,0.225-0.082,0.422-0.244,0.588c-0.158,0.166-0.371,0.262-0.637,0.28
				c0.106,0.046,0.194,0.101,0.262,0.163c0.123,0.122,0.275,0.326,0.455,0.611l0.377,0.604h-0.609l-0.271-0.485
				c-0.216-0.383-0.389-0.621-0.521-0.718c-0.091-0.071-0.224-0.106-0.399-0.106h-0.291v1.311L287.85,112.423 M288.348,110.688
				h0.604c0.289,0,0.484-0.043,0.588-0.129c0.105-0.084,0.16-0.199,0.16-0.342c0-0.091-0.025-0.173-0.075-0.242
				c-0.051-0.074-0.122-0.127-0.213-0.164c-0.091-0.035-0.254-0.053-0.498-0.053h-0.565V110.688"/>
		</g>
	</g>
</g>
</svg>
'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} +.discover { + background-image: url('data:image/svg+xml;base64,<?xml version="1.0" standalone="no"?><!-- no kidding around my files... (http://www.dodero.eu) --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg id="Untitled-Page%201" viewBox="0 0 1430 880" style="background-color:#ffffff00" version="1.1"	xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"	x="0px" y="0px" width="1430px" height="880px">	<defs>		<radialGradient id="gradient1" cx="50.6977%" cy="50%" r="50%">			<stop stop-color="#ffffff" stop-opacity="1" offset="0%"/>			<stop stop-color="#ff8000" stop-opacity="1" offset="100%"/>		</radialGradient>	</defs>	<g>		<rect x="0" y="-1" width="1430" height="880" fill="#ffffff"/>		<path d="M 1429.98 879.0058 L 357.3838 878.9818 C 507.3335 853.6667 738.6665 804.3334 1014.6665 711.6667 C 1290.6665 619 1415.3335 525.8333 1429.98 517.9085 L 1429.98 879.0058 Z" fill="#ff8000"/>		<g>			<path d="M 150.0288 399.6931 C 178.333 399.6931 200.3457 390.7787 216.0825 372.9343 C 231.8193 355.1056 239.6875 330.0635 239.6875 297.8238 C 239.6875 267.5213 232.2563 244.3376 217.4253 228.2572 C 202.5781 212.1924 181.2056 204.1443 153.3232 204.1443 L 75.8262 204.1443 L 75.8262 399.6931 L 150.0288 399.6931 L 150.0288 399.6931 ZM 113.7939 231.3598 L 136.2437 231.3598 C 150.5601 231.3598 161.457 232.9978 168.9507 236.258 C 176.4287 239.5182 182.8296 245.4244 188.1372 253.9765 C 195.8496 266.4188 199.7212 281.9795 199.7212 300.6587 C 199.7212 324.8188 194.9131 342.8365 185.2959 354.6961 C 175.6792 366.5556 161.0977 372.4775 141.5518 372.4775 L 113.7939 372.4775 L 113.7939 231.3598 L 113.7939 231.3598 Z" fill="#000000"/>			<path d="M 311.627 399.6931 L 311.627 204.1443 L 273.6587 204.1443 L 273.6587 399.6931 L 311.627 399.6931 L 311.627 399.6931 Z" fill="#000000"/>			<path d="M 391.2114 404.733 C 413.1304 404.733 430.3188 399.5829 442.793 389.251 C 455.251 378.9349 461.4956 364.6814 461.4956 346.5062 C 461.4956 333.7174 458.2017 322.8816 451.6138 313.9673 C 445.0254 305.0529 433.0513 295.3195 415.6597 284.7672 L 402.7485 276.9868 C 393.0693 271.0965 386.6216 266.1353 383.4058 262.1034 C 380.1738 258.0714 378.5659 253.378 378.5659 248.0231 C 378.5659 241.5342 381.0171 236.3053 385.9346 232.3048 C 390.8369 228.3202 397.3623 226.3199 405.5117 226.3199 C 416.0498 226.3199 430.3813 230.0211 448.5068 237.4078 L 448.5068 206.1603 C 430.5376 201.4668 414.395 199.1044 400.0791 199.1044 C 382.188 199.1044 367.7939 204.0025 356.9126 213.7989 C 346.0308 223.5952 340.5981 236.5573 340.5981 252.7007 C 340.5981 264.7966 343.9233 275.3489 350.5894 284.3893 C 357.2402 293.4296 368.6523 302.8637 384.8262 312.6758 L 396.894 319.9049 C 406.6357 325.8583 413.1772 331.0242 416.5181 335.3869 C 419.8594 339.7653 421.5298 345.1202 421.5298 351.4516 C 421.5298 359.484 418.7505 365.8469 413.1929 370.5088 C 407.6353 375.1865 400.0166 377.5175 390.3687 377.5175 C 376.5679 377.5175 359.9878 373.1548 340.5981 364.4137 L 340.5981 397.6771 C 359.8315 402.3706 376.6924 404.733 391.2114 404.733 L 391.2114 404.733 Z" fill="#000000"/>			<path d="M 628.5 360.5838 C 608.3164 370.0193 606.1743 376.725 586.3735 376.725 C 564.2754 376.725 547.0322 370.1138 534.6436 356.8914 C 522.2378 343.6691 516.0435 325.2556 516.0435 301.6195 C 516.0435 277.5731 521.7852 259.0018 533.3037 245.9057 C 544.8223 232.8096 561.1782 231.2706 582.3887 231.2706 C 598.9707 231.2706 601.7046 235.3099 626.2729 243.3885 L 626.2729 211.0742 C 604.188 204.579 600.623 201 578.6826 201 C 544.3008 201 517.853 207.9112 499.3047 225.7093 C 480.7568 243.5232 471.5 268.9581 471.5 301.9982 C 471.5 334.4387 480.7222 359.7158 499.1655 377.8295 C 517.6089 395.9431 543.3608 405 576.4204 405 C 603.4946 405 608.9604 400.9607 628.5 392.8821 L 628.5 360.5838 Z" fill="#000000"/>			<path d="M 971.1035 399.6931 L 1036.0176 204.1443 L 1004.8374 204.1443 L 954.583 355.4993 L 903.2515 204.1443 L 865.1602 204.1443 L 931.4795 399.6931 L 971.1035 399.6931 Z" fill="#000000"/>			<path d="M 1177.896 399.6931 L 1177.896 372.4775 L 1097.9634 372.4775 L 1097.9634 313.0065 L 1157.9131 313.0065 L 1157.9131 285.791 L 1097.9634 285.791 L 1097.9634 231.3598 L 1171.9009 231.3598 L 1171.9009 204.1443 L 1059.9956 204.1443 L 1059.9956 399.6931 L 1177.896 399.6931 L 1177.896 399.6931 Z" fill="#000000"/>			<path d="M 1242.8394 399.6931 L 1242.8394 320.0624 L 1263.0098 320.0624 L 1307.9092 399.6931 L 1353.7456 399.6931 L 1294.374 308.2816 C 1305.3804 303.0054 1314.0293 295.4141 1320.3208 285.5232 C 1326.6123 275.6324 1329.7656 264.6548 1329.7656 252.5905 C 1329.7656 220.3035 1311.5313 204.1443 1275.062 204.1443 L 1207.8691 204.1443 L 1207.8691 399.6931 L 1242.8394 399.6931 L 1242.8394 399.6931 ZM 1242.8394 231.3598 L 1255.7349 231.3598 C 1279.7769 231.3598 1291.7979 240.0222 1291.7979 257.3154 C 1291.7979 281.0031 1278.3252 292.8469 1251.3945 292.8469 L 1242.8394 292.8469 L 1242.8394 231.3598 L 1242.8394 231.3598 Z" fill="#000000"/>			<path id="Ellipse" d="M 645.5 302.5 C 645.5 243.1286 693.6284 195 753 195 C 812.3716 195 860.5 243.1286 860.5 302.5 C 860.5 361.8714 812.3716 410 753 410 C 693.6284 410 645.5 361.8714 645.5 302.5 Z" fill="url(#gradient1)"/>		</g>		<g>			<path d="M 437 524 L 437 479.0625 L 469.3438 524 L 481 524 L 481 458 L 470 458 L 470 502.9375 L 437.6563 458 L 426 458 L 426 524 L 437 524 L 437 524 Z" fill="#000000"/>			<path d="M 559.3999 524 L 559.3999 515 L 529.3999 515 L 529.3999 494 L 552.3999 494 L 552.3999 485 L 529.3999 485 L 529.3999 467 L 557.3999 467 L 557.3999 458 L 515.3999 458 L 515.3999 524 L 559.3999 524 L 559.3999 524 Z" fill="#000000"/>			<path d="M 619.7998 524 L 619.7998 467 L 643.7998 467 L 643.7998 458 L 581.7998 458 L 581.7998 467 L 605.7998 467 L 605.7998 524 L 619.7998 524 L 619.7998 524 Z" fill="#000000"/>			<path d="M 693.3408 524 L 703.7002 478.4063 L 713.2158 524 L 726.4971 524 L 744.2002 458 L 734.5439 458 L 721.7002 506.375 L 711.7158 458 L 699.6533 458 L 688.7002 506.6563 L 676.2783 458 L 663.2002 458 L 680.2158 524 L 693.3408 524 L 693.3408 524 Z" fill="#000000"/>			<path d="M 826.3813 514.8594 C 832.522 508.7656 835.6001 500.4375 835.6001 489.875 C 835.6001 479.5469 832.522 471.3125 826.3813 465.1875 C 820.2251 459.0625 811.9751 456 801.6157 456 C 791.1938 456 782.9126 459.0625 776.7876 465.1875 C 770.6626 471.3125 767.6001 479.5938 767.6001 490 C 767.6001 500.3125 770.647 508.5469 776.7407 514.7344 C 782.8345 520.9219 790.9751 524 801.1626 524 C 811.8188 524 820.2251 520.9531 826.3813 514.8594 L 826.3813 514.8594 ZM 787.022 508.1406 C 783.397 503.5625 781.6001 497.5156 781.6001 489.9844 C 781.6001 482.3906 783.4126 476.3281 787.0532 471.7969 C 790.6782 467.2656 795.5376 465 801.6313 465 C 807.6313 465 812.4595 467.2656 816.1157 471.7969 C 819.772 476.3281 821.6001 482.3438 821.6001 489.8438 C 821.6001 497.5781 819.772 503.7031 816.147 508.2188 C 812.5063 512.75 807.5688 515 801.3345 515 C 795.4126 515 790.647 512.7188 787.022 508.1406 L 787.022 508.1406 Z" fill="#000000"/>			<path d="M 880 524 L 880 497 L 886.3906 497 L 903.0938 524 L 920 524 L 898.2344 493.25 C 902.2031 491.4688 905.3125 488.8906 907.5938 485.5469 C 909.8594 482.2031 911 478.4844 911 474.3906 C 911 463.4688 904.2656 458 890.8125 458 L 866 458 L 866 524 L 880 524 L 880 524 ZM 880 467 L 884.4844 467 C 892.8281 467 897 469.9531 897 475.8594 C 897 483.9531 892.3125 488 882.9688 488 L 880 488 L 880 467 L 880 467 Z" fill="#000000"/>			<path d="M 961.3999 524 L 961.3999 491.5313 L 986.6655 524 L 1003.6499 524 L 975.2593 487.5156 L 997.6499 458 L 985.6812 458 L 961.3999 490 L 961.3999 458 L 947.3999 458 L 947.3999 524 L 961.3999 524 L 961.3999 524 Z" fill="#000000"/>		</g>	</g></svg>'); + background-size: auto 80%; + background-repeat: no-repeat; + background-position-x: 98%; + background-position-y: 50%; +} \ No newline at end of file diff --git a/src/app/styles/components/glob.less b/src/app/styles/components/glob.less index 1d27e8e5..fc9e11d7 100644 --- a/src/app/styles/components/glob.less +++ b/src/app/styles/components/glob.less @@ -1,6 +1,7 @@ @import '_catalog-card'; @import '_category-tree'; @import '_datepicker'; +@import '_creditcard'; @import '_loading-indicators'; @import '_logo-display'; @import '_modals'; From 9623536e1512efa547adff1371ea7c1bc62d0178 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 07:59:56 -0500 Subject: [PATCH 111/158] include .gitignore entry for vscode folder --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ba4293a4..abaa97b4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ bower_components/ errorShots/ .idea plato/ -.publish/ \ No newline at end of file +.publish/ +.vscode/ \ No newline at end of file From bd24c367701161cb1eb12fc2278f99ede2478387 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Fri, 21 Apr 2017 09:15:32 -0500 Subject: [PATCH 112/158] ocRoles refactor: - Change ocRolesService to ocRoles - Change ocRoles provider to $ocRoles - Remove ocRoles.Remove() functionality - Add object notation example - Update ocRoles service logic --- src/app/app.controller.js | 4 +- .../directives/oc-if-roles/oc-if-roles.js | 34 +++++----- .../oc-readonly-roles/oc-readonly-roles.js | 6 +- src/app/common/services/oc-roles/oc-roles.js | 66 ++++++++++++------- src/app/login/js/login.controller.js | 4 +- src/app/login/js/login.service.js | 3 +- 6 files changed, 69 insertions(+), 48 deletions(-) diff --git a/src/app/app.controller.js b/src/app/app.controller.js index f40d91c8..c93e25f2 100644 --- a/src/app/app.controller.js +++ b/src/app/app.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('AppCtrl', AppController) ; -function AppController($state, $ocMedia, LoginService, appname, ocStateLoading, ocIsTouchDevice, ocRolesService) { +function AppController($state, $ocMedia, LoginService, appname, ocStateLoading, ocIsTouchDevice, ocRoles) { var vm = this; vm.name = appname; vm.$state = $state; @@ -10,5 +10,5 @@ function AppController($state, $ocMedia, LoginService, appname, ocStateLoading, vm.isTouchDevice = ocIsTouchDevice; vm.stateLoading = ocStateLoading.Watch; vm.logout = LoginService.Logout; - vm.userIsAuthorized = ocRolesService.UserIsAuthorized; + vm.userIsAuthorized = ocRoles.UserIsAuthorized; } \ No newline at end of file diff --git a/src/app/common/directives/oc-if-roles/oc-if-roles.js b/src/app/common/directives/oc-if-roles/oc-if-roles.js index 6585aa6c..f792bfca 100644 --- a/src/app/common/directives/oc-if-roles/oc-if-roles.js +++ b/src/app/common/directives/oc-if-roles/oc-if-roles.js @@ -1,6 +1,5 @@ angular.module('orderCloud') - .directive('ocIfRoles', OrderCloudIfRoles) -; + .directive('ocIfRoles', OrderCloudIfRoles); /** * @ngdoc directive @@ -22,9 +21,12 @@ angular.module('orderCloud') * * 4) RoleGroup alias can be configured ahead of time using the ocRolesProvider -- RoleGroups can be configured to compare for ANY or ALL provided roles * <div oc-if-roles="MyGroupOfRoles"></div> + * + * 5) Object notation similar to that used in ocNavItems can also be used. This can include multiple Roles and/or RoleGroups + * <div oc-if-roles="{Items:['BuyerRoles', 'CatalogRoles'], Any:false}"></div> */ -function OrderCloudIfRoles(ocRolesService, ocRoles) { +function OrderCloudIfRoles(ocRoles, $ocRoles) { var directive = { multiElement: true, restrict: 'A', @@ -32,27 +34,27 @@ function OrderCloudIfRoles(ocRolesService, ocRoles) { link: link }; - function link(scope, element, attr, ctrl) { + function link(scope, element, attr) { + //Use attr.ocIfRoles to avoid need for isolated scope var attrValue = attr.ocIfRoles; - var roleGroups = ocRoles.GetRoleGroups(); - - if (attrValue && !/[^a-z]/i.test(attrValue)) { + var roleGroups = $ocRoles.GetRoleGroups(); + var ocIfRolesObj = scope.$eval(attrValue); + if (typeof ocIfRolesObj == 'object') { + analyzeRoles(ocIfRolesObj.Items, ocIfRolesObj.Any); + } else if (attrValue && !/[^a-z]/i.test(attrValue)) { if (roleGroups[attrValue]) { //single string role group var roleGroup = roleGroups[attrValue]; - analyzeRoles(roleGroup.Roles, roleGroup.Type == 'Any'); - } - else { + analyzeRoles(roleGroup.Roles, roleGroup.Type === 'Any'); + } else { //single string role analyzeRoles([attrValue]); } - } - else if (attrValue.split(' || ').length > 1) { + } else if (attrValue.split(' || ').length > 1) { //pipe delimited string values analyzeRoles(attrValue.split(' || '), true); - } - else { - scope.$watch(attr.ocIfRoles, function ocIfWatchAction(value) { + } else { + scope.$watch('ocIfRoles', function ocIfWatchAction(value) { if (angular.isArray(value) && value.length && (typeof value[0] == 'string')) { //interpolated array value analyzeRoles(value); @@ -61,7 +63,7 @@ function OrderCloudIfRoles(ocRolesService, ocRoles) { } function analyzeRoles(requiredRoles, any) { - if (!ocRolesService.UserIsAuthorized(requiredRoles, any)) { + if (!ocRoles.UserIsAuthorized(requiredRoles, any)) { removeElement(); } } diff --git a/src/app/common/directives/oc-readonly-roles/oc-readonly-roles.js b/src/app/common/directives/oc-readonly-roles/oc-readonly-roles.js index 3d2d1787..f68312a7 100644 --- a/src/app/common/directives/oc-readonly-roles/oc-readonly-roles.js +++ b/src/app/common/directives/oc-readonly-roles/oc-readonly-roles.js @@ -6,7 +6,7 @@ angular.module('orderCloud') .directive('button', OrderCloudReadonlyRolesButton) ; -function OrderCloudReadonlyRoles(ocRoles, ocRolesService) { +function OrderCloudReadonlyRoles($ocRoles, ocRoles) { var directive = { restrict: 'A', controller: function($scope, $attrs, $element) { @@ -14,7 +14,7 @@ function OrderCloudReadonlyRoles(ocRoles, ocRolesService) { vm.Authorized = true; var attrValue = $attrs.ocReadonlyRoles; - var roleGroups = ocRoles.GetRoleGroups(); + var roleGroups = $ocRoles.GetRoleGroups(); if (attrValue && !/[^a-z]/i.test(attrValue)) { if (roleGroups[attrValue]) { @@ -40,7 +40,7 @@ function OrderCloudReadonlyRoles(ocRoles, ocRolesService) { } function analyzeRoles(requiredRoles, any) { - if (!ocRolesService.UserIsAuthorized(requiredRoles, any)) { + if (!ocRoles.UserIsAuthorized(requiredRoles, any)) { vm.Authorized = false; $element.addClass('oc-read-only') } else { diff --git a/src/app/common/services/oc-roles/oc-roles.js b/src/app/common/services/oc-roles/oc-roles.js index 08420e5a..119537cb 100644 --- a/src/app/common/services/oc-roles/oc-roles.js +++ b/src/app/common/services/oc-roles/oc-roles.js @@ -1,17 +1,16 @@ angular.module('orderCloud') - .factory('ocRolesService', OrderCloudRolesService) - .provider('ocRoles', OrderCloudRolesProvider) + .factory('ocRoles', OrderCloudRolesService) + .provider('$ocRoles', OrderCloudRolesProvider) ; -function OrderCloudRolesService($window, OrderCloudSDK) { +function OrderCloudRolesService($window, $cookies, $ocRoles, OrderCloudSDK, ocAppName) { var service = { Set: _set, Get: _get, - Remove: _remove, UserIsAuthorized: _userIsAuthorized }; - var roles; + var cookieName = ocAppName.Watch().replace(/ /g, '_').toLowerCase() + '_roles'; function base64Decode(string) { var output = string.replace(/-/g, '+').replace(/_/g, '/'); @@ -45,42 +44,62 @@ function OrderCloudRolesService($window, OrderCloudSDK) { } var decodedTokenObject = JSON.parse(decodedToken); - roles = decodedTokenObject.role; + var roles = decodedTokenObject.role; if (typeof roles == 'string') roles = [roles]; + $cookies.putObject(cookieName, {Roles: roles}); return roles || []; } //Returns local service variable or obtains roles again from token function _get() { - return roles || _set(OrderCloudSDK.GetToken()); + var cookie = $cookies.getObject(cookieName); + return cookie ? cookie.Roles : _set(OrderCloudSDK.GetToken()); } - //Removes local service variable - function _remove() { - roles = null; - } - - //Returns boolean whether user's claimed roles cover a required array of roles - function _userIsAuthorized(requiredRoles, any) { + //Returns boolean whether user's claimed roles cover a array of roles and/or Role Groups + //Role Groups use the group's Type setting. Individual roles use the any parameter when combined + //Ex: ocRoles.UserIsAuthorized(['CategoryReader', 'CatalogReader', 'RoleGroupA'], true); + //Evaluates whether user is authorized for RoleGroupA's configuration AND has either CategoryReader or CatalogReader + function _userIsAuthorized(roleItems, any) { var userRoles = _get(); + if (!userRoles) return; - if (userRoles.indexOf('FullAccess') > -1) { - return true; - } - else if (any) { - return _.intersection(requiredRoles, userRoles).length > 0; - } - else { - return _.difference(requiredRoles, userRoles).length == 0; + if (userRoles.indexOf('FullAccess') > -1) return true; + + function analyzeRoles(roles, hasAny) { + if (hasAny) { + return _.intersection(roles, userRoles).length > 0; + } else { + return _.difference(roles, userRoles).length === 0; + } } + + var authorized = false; + var roleGroups = $ocRoles.GetRoleGroups(); + var roles = []; + + angular.forEach(roleItems, function(item) { + if (authorized && any) return; + if (roleGroups[item]) { + var roleGroup = roleGroups[item]; + authorized = analyzeRoles(roleGroup.Roles, roleGroup.Type === 'Any'); + } + else { + roles.push(item); + } + }); + if (authorized && any) return authorized; + if ((!authorized || !any) && roles.length) authorized = analyzeRoles(roles, any); + + return authorized; } return service; } -function OrderCloudRolesProvider() { +function OrderCloudRolesProvider(scope) { var roleGroups = {}; return { @@ -93,6 +112,7 @@ function OrderCloudRolesProvider() { }, AddRoleGroup: function(roleGroup) { if (!roleGroup.Name) throw 'ocRoles: RoleGroup must have a Name value'; + if (scope.indexOf(roleGroup.Name) > -1) throw 'ocRole: RoleGroup Name cannot match an OrderCloud role name: ' + roleGroup.Name; if (!roleGroup.Roles || !roleGroup.Roles.length) throw 'ocRoles: RoleGroup must have Roles'; if (!angular.isArray(roleGroup.Roles)) throw 'ocRoles: RoleGroup Roles must be an array'; if (!roleGroup.Type || ['All', 'Any'].indexOf(roleGroup.Type) == -1) throw 'ocRoles: RoleGroup Type must be \'All\' or \'Any\''; diff --git a/src/app/login/js/login.controller.js b/src/app/login/js/login.controller.js index c067db3d..e678c3d6 100644 --- a/src/app/login/js/login.controller.js +++ b/src/app/login/js/login.controller.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .controller('LoginCtrl', LoginController) ; -function LoginController($state, $stateParams, $exceptionHandler, OrderCloudSDK, LoginService, ocRolesService, buyerid, clientid, scope) { +function LoginController($state, $stateParams, $exceptionHandler, OrderCloudSDK, LoginService, ocRoles, buyerid, clientid, scope) { var vm = this; vm.credentials = { Username: null, @@ -20,7 +20,7 @@ function LoginController($state, $stateParams, $exceptionHandler, OrderCloudSDK, .then(function(data) { OrderCloudSDK.SetToken(data.access_token); if (vm.rememberStatus) OrderCloudSDK.SetRefreshToken(data['refresh_token']); - var roles = ocRolesService.Set(data.access_token); + var roles = ocRoles.Set(data.access_token); if (roles.length == 1 && roles[0] == 'PasswordReset') { vm.token = data.access_token; vm.form = 'resetByToken'; diff --git a/src/app/login/js/login.service.js b/src/app/login/js/login.service.js index e879e581..026c9f16 100644 --- a/src/app/login/js/login.service.js +++ b/src/app/login/js/login.service.js @@ -2,7 +2,7 @@ angular.module('orderCloud') .factory('LoginService', LoginService) ; -function LoginService($q, $window, $state, $cookies, toastr, OrderCloudSDK, ocRolesService, clientid, buyerid, anonymous, scope) { +function LoginService($q, $window, $state, $cookies, toastr, OrderCloudSDK, clientid, buyerid, anonymous, scope) { return { SendVerificationCode: _sendVerificationCode, ResetPassword: _resetPassword, @@ -63,7 +63,6 @@ function LoginService($q, $window, $state, $cookies, toastr, OrderCloudSDK, ocRo angular.forEach($cookies.getAll(), function(val, key) { $cookies.remove(key); }); - ocRolesService.Remove(); $state.go(anonymous ? 'home' : 'login', {}, {reload: true}); } From 9217ece5e6366caeeec5458713773eb65fb80db7 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 09:29:18 -0500 Subject: [PATCH 113/158] remove functionality that gets product info for li MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit product info is now a part of the line item object so we don’t need to get the product info separately --- src/app/cart/js/cart.config.js | 21 ++----------------- .../confirmation/js/confirmation.config.js | 12 ++--------- src/app/checkout/review/js/review.config.js | 21 ++----------------- 3 files changed, 6 insertions(+), 48 deletions(-) diff --git a/src/app/cart/js/cart.config.js b/src/app/cart/js/cart.config.js index 3b966071..293a6768 100644 --- a/src/app/cart/js/cart.config.js +++ b/src/app/cart/js/cart.config.js @@ -14,25 +14,8 @@ function CartConfig($stateProvider) { pageTitle: 'Shopping Cart' }, resolve: { - LineItemsList: function($q, $state, toastr, OrderCloudSDK, ocLineItems, CurrentOrder) { - var dfd = $q.defer(); - OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID) - .then(function(data) { - if (!data.Items.length) { - dfd.resolve(data); - } - else { - ocLineItems.GetProductInfo(data.Items) - .then(function() { - dfd.resolve(data); - }); - } - }) - .catch(function() { - toastr.warning('Your order does not contain any line items.'); - dfd.reject(); - }); - return dfd.promise; + LineItemsList: function(OrderCloudSDK, CurrentOrder) { + return OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID); }, CurrentPromotions: function(CurrentOrder, OrderCloudSDK) { return OrderCloudSDK.Orders.ListPromotions('outgoing', CurrentOrder.ID); diff --git a/src/app/checkout/confirmation/js/confirmation.config.js b/src/app/checkout/confirmation/js/confirmation.config.js index 53cc3185..6df8a6f5 100644 --- a/src/app/checkout/confirmation/js/confirmation.config.js +++ b/src/app/checkout/confirmation/js/confirmation.config.js @@ -59,16 +59,8 @@ function CheckoutConfirmationConfig($stateProvider) { return deferred.promise; }, - LineItemsList: function($q, $state, toastr, ocLineItems, SubmittedOrder, OrderCloudSDK) { - var dfd = $q.defer(); - OrderCloudSDK.LineItems.List('outgoing', SubmittedOrder.ID, {pageSize: 100}) - .then(function(data) { - ocLineItems.GetProductInfo(data.Items) - .then(function() { - dfd.resolve(data); - }); - }); - return dfd.promise; + LineItemsList: function(SubmittedOrder, OrderCloudSDK) { + return OrderCloudSDK.LineItems.List('outgoing', SubmittedOrder.ID, {pageSize: 100}); } } }); diff --git a/src/app/checkout/review/js/review.config.js b/src/app/checkout/review/js/review.config.js index 7cc9d03e..1e665a97 100644 --- a/src/app/checkout/review/js/review.config.js +++ b/src/app/checkout/review/js/review.config.js @@ -10,25 +10,8 @@ function CheckoutReviewConfig($stateProvider) { controller: 'CheckoutReviewCtrl', controllerAs: 'checkoutReview', resolve: { - LineItemsList: function($q, $state, toastr, OrderCloudSDK, ocLineItems, CurrentOrder) { - var dfd = $q.defer(); - OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID, {pageSize: 100}) - .then(function(data) { - if (!data.Items.length) { - dfd.resolve(data); - } - else { - ocLineItems.GetProductInfo(data.Items) - .then(function() { - dfd.resolve(data); - }); - } - }) - .catch(function() { - toastr.warning('Your order does not contain any line items.'); - dfd.reject(); - }); - return dfd.promise; + LineItemsList: function(OrderCloudSDK, CurrentOrder) { + return OrderCloudSDK.LineItems.List('outgoing', CurrentOrder.ID, {pageSize: 100}); }, OrderPaymentsDetail: function($q, OrderCloudSDK, CurrentOrder, $state) { return OrderCloudSDK.Payments.List('outgoing', CurrentOrder.ID) From def998b0a1471e9bfe45f3d2c451aa5fb2a7c858 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 09:29:47 -0500 Subject: [PATCH 114/158] fix unit tests for cart --- src/app/cart/js/cart.controller.js | 44 +++++------ src/app/cart/test/cart.spec.js | 114 +++++++++++++++++++---------- 2 files changed, 99 insertions(+), 59 deletions(-) diff --git a/src/app/cart/js/cart.controller.js b/src/app/cart/js/cart.controller.js index b72f7b75..573407ad 100644 --- a/src/app/cart/js/cart.controller.js +++ b/src/app/cart/js/cart.controller.js @@ -6,7 +6,22 @@ function CartController($rootScope, $state, toastr, OrderCloudSDK, LineItemsList var vm = this; vm.lineItems = LineItemsList; vm.promotions = CurrentPromotions.Meta ? CurrentPromotions.Items : CurrentPromotions; - vm.removeItem = function(order, scope) { + vm.removeItem = removeItem; + vm.removePromotion = removePromotion; + vm.cancelOrder = cancelOrder; + + $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { + return OrderCloudSDK.Orders.ListPromotions('outgoing', orderid) + .then(function(data) { + if (data.Meta) { + vm.promotions = data.Items; + } else { + vm.promotions = data; + } + }); + }); + + function removeItem(order, scope) { vm.lineLoading = []; vm.lineLoading[scope.$index] = OrderCloudSDK.LineItems.Delete('outgoing', order.ID, scope.lineItem.ID) .then(function () { @@ -14,19 +29,18 @@ function CartController($rootScope, $state, toastr, OrderCloudSDK, LineItemsList vm.lineItems.Items.splice(scope.$index, 1); toastr.success(scope.lineItem.Product.Name + ' was removed from your shopping cart.'); }); - }; + } - //TODO: missing unit tests - vm.removePromotion = function(order, scope) { - OrderCloudSDK.Orders.RemovePromotion('outgoing', order.ID, scope.promotion.Code) + function removePromotion(order, scope) { + return OrderCloudSDK.Orders.RemovePromotion('outgoing', order.ID, scope.promotion.Code) .then(function() { $rootScope.$broadcast('OC:UpdateOrder', order.ID); vm.promotions.splice(scope.$index, 1); }); - }; + } - vm.cancelOrder = function(order){ - ocConfirm.Confirm({ + function cancelOrder(order){ + return ocConfirm.Confirm({ message:'Are you sure you want to cancel this order?', confirmText: 'Yes, cancel order', type: 'delete'}) @@ -36,17 +50,5 @@ function CartController($rootScope, $state, toastr, OrderCloudSDK, LineItemsList $state.go('home', {}, {reload:'base'}); }); }); - }; - - //TODO: missing unit tests - $rootScope.$on('OC:UpdatePromotions', function(event, orderid) { - OrderCloudSDK.Orders.ListPromotions('outgoing', orderid) - .then(function(data) { - if (data.Meta) { - vm.promotions = data.Items; - } else { - vm.promotions = data; - } - }); - }); + } } \ No newline at end of file diff --git a/src/app/cart/test/cart.spec.js b/src/app/cart/test/cart.spec.js index cd29583f..83f0c5fd 100644 --- a/src/app/cart/test/cart.spec.js +++ b/src/app/cart/test/cart.spec.js @@ -5,20 +5,18 @@ describe('Component: Cart', function() { currentOrder, rootScope, lineItemsList, - _ocLineItems, - fakeOrder, - user + promoList, + fakeOrder ; beforeEach(module('orderCloud')); - beforeEach(module('orderCloud.sdk')); + beforeEach(module('ordercloud-angular-sdk')); beforeEach(module(function($provide) { - $provide.value('CurrentOrder', {ID: "MockOrderID3456"}); + $provide.value('CurrentOrder', {ID: 'MockOrderID3456'}); })); - beforeEach(inject(function($rootScope, $q, OrderCloud, ocLineItems, CurrentOrder) { + beforeEach(inject(function($rootScope, $q, OrderCloudSDK, CurrentOrder) { scope = $rootScope.$new(); q = $q; - oc = OrderCloud; - _ocLineItems = ocLineItems; + oc = OrderCloudSDK; currentOrder = CurrentOrder; rootScope = $rootScope; fakeOrder = { @@ -44,15 +42,16 @@ describe('Component: Cart', function() { "ItemRange" : [1,2] } }; - user = { - ID: "TestUser132456789", - xp: { - defaultShippingAddressID: "TestAddress123456789", - defaultBillingAddressID: "TestAddress123456789", - defaultCreditCardID: "creditCard" + promoList = { + "Items": [{ID:"Promo1"}, {ID: "Promot2"}], + "Meta": { + "Page": 1, + "PageSize": 20, + "TotalCount":29, + "TotalPages": 3, + "ItemRange" : [1,2] } - - }; + } })); describe('State: Cart', function() { @@ -61,56 +60,95 @@ describe('Component: Cart', function() { state = $state.get('cart'); var defer = q.defer(); defer.resolve(lineItemsList); - spyOn(oc.LineItems,'List').and.returnValue(defer.promise); - spyOn(_ocLineItems,'GetProductInfo').and.returnValue(defer.promise); + + var promoDefer = q.defer(); + defer.resolve(promoList); + + spyOn(oc.LineItems, 'List').and.returnValue(defer.promise); + spyOn(oc.Orders, 'ListPromotions').and.returnValue(promoDefer.promise); })); - it('should call LineItems.List',inject(function($injector){ + it('should call LineItems.List', inject(function($injector){ $injector.invoke(state.resolve.LineItemsList); - expect(oc.LineItems.List).toHaveBeenCalledWith(currentOrder.ID); + expect(oc.LineItems.List).toHaveBeenCalledWith('outgoing', currentOrder.ID); })); - it('should call LineItemHelper', inject(function($injector){ - $injector.invoke(state.resolve.LineItemsList); + it('should call Orders.ListPromotions', inject(function($injector){ + $injector.invoke(state.resolve.CurrentPromotions); scope.$digest(); - expect(_ocLineItems.GetProductInfo).toHaveBeenCalled(); + expect(oc.Orders.ListPromotions).toHaveBeenCalledWith('outgoing', currentOrder.ID); })); }); - describe('Controller : CartController',function() { + describe('Controller : CartController', function() { var cartController; var confirm; - beforeEach(inject(function($state, $controller, ocConfirm) { + beforeEach(inject(function($controller, ocConfirm) { cartController = $controller('CartCtrl', { $scope: scope, - CurrentPromotions: [], + $rootScope: rootScope, + CurrentPromotions: promoList, LineItemsList: lineItemsList }); confirm = ocConfirm; - var defer = q.defer(); - defer.resolve(lineItemsList); - spyOn(rootScope, '$broadcast'); })); - describe('removeItem()', function() { + describe('OC:UpdatePromotions', function(){ + beforeEach(function(){ + var defer = q.defer(); + defer.resolve({Meta:{}, Items: []}); + spyOn(oc.Orders, 'ListPromotions').and.returnValue(defer.promise); + }); + it('should update value of promotionsList', function(){ + expect(cartController.promotions).toEqual(promoList.Items); + rootScope.$broadcast('OC:UpdatePromotions', currentOrder.ID); + scope.$digest(); + expect(oc.Orders.ListPromotions).toHaveBeenCalledWith('outgoing', currentOrder.ID); + scope.$digest(); + expect(cartController.promotions).toEqual([]); + }); + }); + + describe('removeItem', function() { beforeEach(function() { var df = q.defer(); df.resolve(); spyOn(oc.LineItems, 'Delete').and.returnValue(df.promise); + spyOn(rootScope, '$broadcast'); + }); + it('should delete the line item', function() { + var lineItem = angular.copy(lineItemsList.Items[0]); //list gets mutated after deletion so save copy + cartController.removeItem(fakeOrder, {$index:0, lineItem: lineItem}); + scope.$digest(); + expect(oc.LineItems.Delete).toHaveBeenCalledWith('outgoing', fakeOrder.ID, lineItem.ID); + scope.$digest(); + expect(rootScope.$broadcast).toHaveBeenCalledWith('OC:UpdateOrder', fakeOrder.ID); + scope.$digest(); + expect(cartController.lineItems.Items).toEqual([{ID: "LI2"}]); }); - it ('should delete the line item', function() { - cartController.removeItem(fakeOrder, {$index:0, lineItem: lineItemsList.Items[0]}); - expect(oc.LineItems.Delete).toHaveBeenCalledWith(fakeOrder.ID, lineItemsList.Items[0].ID); + }); + + describe('removePromotions', function(){ + beforeEach(function(){ + var d = q.defer(); + d.resolve(); + spyOn(oc.Orders, 'RemovePromotion').and.returnValue(d.promise); + spyOn(rootScope, '$broadcast'); + }); + it('should call oc.Orders.RemovePromotion', function(){ + var mockScope = {$index: 0, promotion: {Code: 'Promo123'}}; + cartController.removePromotion(fakeOrder, mockScope); + scope.$digest(); + expect(oc.Orders.RemovePromotion).toHaveBeenCalledWith('outgoing', fakeOrder.ID, mockScope.promotion.Code); scope.$digest(); expect(rootScope.$broadcast).toHaveBeenCalledWith('OC:UpdateOrder', fakeOrder.ID); - expect(cartController.lineItems.Items).toEqual([{ID:"LI2"}]); - }) + }); }); - describe('CancelOrder',function() { + describe('cancelOrder',function() { beforeEach(function() { var df = q.defer(); df.resolve(); - spyOn(confirm,'Confirm').and.returnValue(df.promise); + spyOn(confirm, 'Confirm').and.returnValue(df.promise); spyOn(oc.Orders, 'Delete').and.returnValue(df.promise); }); it('should call OrderCloud Confirm modal prompt', function() { @@ -120,7 +158,7 @@ describe('Component: Cart', function() { it('should call OC Orders Delete Method', function(){ cartController.cancelOrder(fakeOrder); scope.$digest(); - expect(oc.Orders.Delete).toHaveBeenCalledWith(fakeOrder.ID); + expect(oc.Orders.Delete).toHaveBeenCalledWith('outgoing', fakeOrder.ID); }); }); }); From 12f9481cd23f852c0540a5a682292addf586e0e7 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 10:49:01 -0500 Subject: [PATCH 115/158] update sdk to most recent version --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 318c6326..39e282f5 100644 --- a/bower.json +++ b/bower.json @@ -45,7 +45,7 @@ "jasny-bootstrap": "3.1.3", "angular-payments": "*", "bootswatch": "^3.3.7", - "ordercloud-angular-sdk": "v1.0.46-staging-prerelease" + "ordercloud-angular-sdk": "v1.0.47-staging-prerelease" }, "devDependencies": { "angular-mocks": "^1.6.0" From 68b938e6cd5ad440c55ac1ffcb9fc548793fca4f Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 10:49:41 -0500 Subject: [PATCH 116/158] clean up formatting and remove extraneous packages from gulp folders --- gulp/build/scripts.js | 2 -- gulp/build/serve-build.js | 4 ++-- gulp/build/styles.js | 1 - gulp/compile/app-js.js | 4 +--- gulp/compile/lib-js.js | 2 +- package.json | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/gulp/build/scripts.js b/gulp/build/scripts.js index 015614af..559b39ed 100644 --- a/gulp/build/scripts.js +++ b/gulp/build/scripts.js @@ -2,8 +2,6 @@ var gulp = require('gulp'), config = require('../../gulp.config'), cache = require('gulp-cached'), del = require('del'), - filter = require('gulp-filter'), - inject = require('gulp-inject'), wrapper = require('gulp-wrapper'), beautify = require('gulp-beautify'), ngAnnotate = require('gulp-ng-annotate'); diff --git a/gulp/build/serve-build.js b/gulp/build/serve-build.js index 9259a520..bd20b4ad 100644 --- a/gulp/build/serve-build.js +++ b/gulp/build/serve-build.js @@ -8,6 +8,6 @@ var gulp = require('gulp'), gulp.task('serve-build', ['inject'], function() { serve(true /*isDev*/); - if (argv.debug) { - } + // if (argv.debug) { + // } }); diff --git a/gulp/build/styles.js b/gulp/build/styles.js index edb278ac..69cb0999 100644 --- a/gulp/build/styles.js +++ b/gulp/build/styles.js @@ -5,7 +5,6 @@ var gulp = require('gulp'), autoprefixer = require('gulp-autoprefixer'), lessImport = require('gulp-less-import'), sourcemaps = require('gulp-sourcemaps'), - filter = require('gulp-filter'), concatCss = require('gulp-concat-css'), mainBowerFiles = require('main-bower-files'); diff --git a/gulp/compile/app-js.js b/gulp/compile/app-js.js index 4aa476a8..d51f17f4 100644 --- a/gulp/compile/app-js.js +++ b/gulp/compile/app-js.js @@ -7,7 +7,6 @@ var gulp = require('gulp'), concat = require('gulp-concat'), filter = require('gulp-filter'), templateCache = require('gulp-angular-templatecache'), - htmlmin = require('gulp-htmlmin'), uglify = require('gulp-uglify'), fileSort = require('gulp-angular-filesort'), wrapper = require('gulp-wrapper'); @@ -31,7 +30,6 @@ gulp.task('app-js', ['clean:app-js'], function() { .pipe(ngConstant(config.ngConstantSettings)) .pipe(jsonFilter.restore) .pipe(htmlFilter) - //.pipe(htmlmin({collapseWhitespace: true, removeComments: true})) .pipe(templateCache(config.templateCacheSettings)) .pipe(htmlFilter.restore) .pipe(jsFilter) @@ -44,5 +42,5 @@ gulp.task('app-js', ['clean:app-js'], function() { .pipe(concat('app.controller.js')) .pipe(rev()) .pipe(uglify({mangle:false})) //turning off mangle to fix the compile error - .pipe(gulp.dest(config.compile + 'js/')) + .pipe(gulp.dest(config.compile + 'js/')); }); diff --git a/gulp/compile/lib-js.js b/gulp/compile/lib-js.js index a07493c8..2f65012e 100644 --- a/gulp/compile/lib-js.js +++ b/gulp/compile/lib-js.js @@ -18,5 +18,5 @@ gulp.task('lib-js', ['clean:lib-js'], function() { .pipe(uglify()) .pipe(concat('lib.js')) .pipe(rev()) - .pipe(gulp.dest(config.compile + 'js')) + .pipe(gulp.dest(config.compile + 'js')); }); diff --git a/package.json b/package.json index e542406e..2429e2d0 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "heroku-prebuild": "npm install bower gulp --save", "postinstall": "bower install && npm run build-all", "start": "node server.js", - "build-all": "gulp inject index --gulpfile ./heroku.gulpfile.js", + "build-all": "gulp --gulpfile ./heroku.gulpfile.js", "test": "gulp test:unit" }, "repository": { From 9a0e977d88c508592e3e7eacf6ed6273e6936bf4 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 10:51:34 -0500 Subject: [PATCH 117/158] remove .js suffix on folder name this was causing on error on app-js task --- .../ordercloud-angular-sdk.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/app/common/config/{ordercloud-angular-sdk.js => ordercloud-angular-sdk}/ordercloud-angular-sdk.js (100%) diff --git a/src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js b/src/app/common/config/ordercloud-angular-sdk/ordercloud-angular-sdk.js similarity index 100% rename from src/app/common/config/ordercloud-angular-sdk.js/ordercloud-angular-sdk.js rename to src/app/common/config/ordercloud-angular-sdk/ordercloud-angular-sdk.js From 8cb5617e7fc34fa5d4fcafd74a357fcd9e1401fd Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 11:32:38 -0500 Subject: [PATCH 118/158] remove GetProductInfo method no longer necessary as product info is stored directly on line items --- .../services/oc-lineitems/oc-lineitems.js | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/app/common/services/oc-lineitems/oc-lineitems.js b/src/app/common/services/oc-lineitems/oc-lineitems.js index 522527d1..ffc34a9b 100644 --- a/src/app/common/services/oc-lineitems/oc-lineitems.js +++ b/src/app/common/services/oc-lineitems/oc-lineitems.js @@ -2,11 +2,10 @@ angular.module('orderCloud') .factory('ocLineItems', LineItemFactory) ; -function LineItemFactory($rootScope, $q, $uibModal, OrderCloudSDK, catalogid) { +function LineItemFactory($rootScope, $q, $uibModal, OrderCloudSDK) { return { SpecConvert: _specConvert, AddItem: _addItem, - GetProductInfo: _getProductInfo, CustomShipping: _customShipping, UpdateShipping: _updateShipping, ListAll: _listAll @@ -64,24 +63,6 @@ function LineItemFactory($rootScope, $q, $uibModal, OrderCloudSDK, catalogid) { return deferred.promise; } - function _getProductInfo(LineItems) { - var li = LineItems.Items || LineItems; - var productIDs = _.uniq(_.pluck(li, 'ProductID')); - var dfd = $q.defer(); - var queue = []; - angular.forEach(productIDs, function (productid) { - queue.push(OrderCloudSDK.Me.GetProduct(catalogid, productid)); - }); - $q.all(queue) - .then(function (results) { - angular.forEach(li, function (item) { - item.Product = angular.copy(_.where(results, {ID: item.ProductID})[0]); - }); - dfd.resolve(li); - }); - return dfd.promise; - } - function _customShipping(Order, LineItem) { var modalInstance = $uibModal.open({ animation: true, From f98f22641f3b256bc7dcaafa099e70376553af19 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 11:40:54 -0500 Subject: [PATCH 119/158] fix unit tests for base directory --- src/app/base/js/base.config.js | 2 +- src/app/base/js/base.controller.js | 8 ++-- src/app/base/tests/base.spec.js | 62 +++++++++++++++++++++++------- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/app/base/js/base.config.js b/src/app/base/js/base.config.js index 857f2efd..3dbbecd4 100644 --- a/src/app/base/js/base.config.js +++ b/src/app/base/js/base.config.js @@ -17,7 +17,7 @@ function BaseConfig($stateProvider) { } }, resolve: { - CurrentUser: function($q, $state, OrderCloudSDK) { + CurrentUser: function($state, OrderCloudSDK) { return OrderCloudSDK.Me.Get() .then(function(data) { return data; diff --git a/src/app/base/js/base.controller.js b/src/app/base/js/base.controller.js index 62a8d4f9..289955be 100644 --- a/src/app/base/js/base.controller.js +++ b/src/app/base/js/base.controller.js @@ -7,8 +7,10 @@ function BaseController($rootScope, $state, OrderCloudSDK, ocProductSearch, Curr vm.currentUser = CurrentUser; vm.currentOrder = CurrentOrder; - vm.mobileSearch = function() { - ocProductSearch.Open() + vm.mobileSearch = mobileSearch; + + function mobileSearch() { + return ocProductSearch.Open() .then(function(data) { if (data.productID) { $state.go('productDetail', {productid: data.productID}); @@ -16,7 +18,7 @@ function BaseController($rootScope, $state, OrderCloudSDK, ocProductSearch, Curr $state.go('productSearchResults', {searchTerm: data.searchTerm}); } }); - }; + } $rootScope.$on('OC:UpdateOrder', function(event, OrderID, message) { vm.orderLoading = { diff --git a/src/app/base/tests/base.spec.js b/src/app/base/tests/base.spec.js index 18aa0cbf..2d630f5b 100644 --- a/src/app/base/tests/base.spec.js +++ b/src/app/base/tests/base.spec.js @@ -1,51 +1,57 @@ -describe('Component: Base', function() { +fdescribe('Component: Base', function() { var q, scope, oc, buyerid = "BUYERID", state, + productSearch, injector; beforeEach(module('orderCloud')); - beforeEach(module('orderCloud.sdk')); + beforeEach(module('ordercloud-angular-sdk')); beforeEach(module('ui.router')); - beforeEach(inject(function($q, $rootScope, $state, OrderCloud, $injector) { + beforeEach(inject(function($q, $rootScope, $state, OrderCloudSDK, ocProductSearch, $injector) { q = $q; scope = $rootScope.$new(); - oc = OrderCloud; + oc = OrderCloudSDK; state = $state; injector = $injector; + productSearch = ocProductSearch; })); describe('State: Base', function() { var base; beforeEach(function() { base = state.get('base'); }); - it ('should attempt to get the current user and set the buyerid', function() { + it('should resolve CurrentUser - get current user', function() { var user = q.defer(); user.resolve('TEST USER'); spyOn(oc.Me, 'Get').and.returnValue(user.promise); - spyOn(oc.BuyerID, 'Set').and.callThrough(); injector.invoke(base.resolve.CurrentUser, scope, {$q:q, $state:state, OrderCloud:oc, buyerid:buyerid}); expect(oc.Me.Get).toHaveBeenCalled(); scope.$digest(); - expect(oc.BuyerID.Set).toHaveBeenCalledWith('BUYERID'); }); - it ('should search for an existing unsubmitted order', function() { + it('resolve ExistingOrder - attempt to get existing order', function() { var orderList = q.defer(); orderList.resolve({Items:['TEST ORDER']}); - spyOn(oc.Me, 'ListOutgoingOrders').and.returnValue(orderList.promise); + spyOn(oc.Me, 'ListOrders').and.returnValue(orderList.promise); var currentUser = injector.invoke(base.resolve.CurrentUser); injector.invoke(base.resolve.ExistingOrder, scope, {$q:q, OrderCloud:oc, CurrentUser:currentUser}); - expect(oc.Me.ListOutgoingOrders).toHaveBeenCalledWith(null, 1, 1, null, "!DateCreated", {Status: "Unsubmitted"}); + var options = { + page: 1, + pageSize: 1, + sortBy: '!DateCreated', + filters: {Status: 'Unsubmitted'} + }; + expect(oc.Me.ListOrders).toHaveBeenCalledWith(options); }); - it ('should create a new order if there is not an existing unsubmitted order', inject(function(NewOrder) { - var newOrder = NewOrder, + it('resolve CurrentOrder - if ExistingOrder is defined, return it, else create a new order', inject(function(ocNewOrder) { + var newOrder = ocNewOrder, existingOrder, //undefined existing order currentUser = injector.invoke(base.resolve.CurrentUser); spyOn(newOrder, 'Create'); injector.invoke(base.resolve.CurrentOrder, scope, {ExistingOrder: existingOrder, NewOrder: newOrder, CurrentUser: currentUser}); expect(newOrder.Create).toHaveBeenCalledWith({}); - })) + })); }); describe('Controller: BaseCtrl', function(){ @@ -63,9 +69,37 @@ describe('Component: Base', function() { CurrentOrder: fake_order }); })); - it ('should initialize the current user and order into its scope', function() { + it('should initialize the current user and order into its scope', function() { expect(baseCtrl.currentUser).toBe(fake_user); expect(baseCtrl.currentOrder).toBe(fake_order); }); + + describe('mobileSearch', function(){ + var productID, + searchTerm + beforeEach(function(){ + productID = 'mockProductID'; + searchTerm = 'mockSearchTerm'; + spyOn(state, 'go'); + }); + it('should go to productDetail if ocProductSearch returns a productID', function(){ + var d = q.defer(); + d.resolve({productID: productID}); + spyOn(productSearch, 'Open').and.returnValue(d.promise); + baseCtrl.mobileSearch(); + scope.$digest(); + expect(productSearch.Open).toHaveBeenCalled(); + expect(state.go).toHaveBeenCalledWith('productDetail', {productid: productID}); + }); + it('should go to productSearchResults if ocProductSearch doesnt return a productID', function(){ + var d = q.defer(); + d.resolve({searchTerm: searchTerm}); + spyOn(productSearch, 'Open').and.returnValue(d.promise); + baseCtrl.mobileSearch(); + scope.$digest(); + expect(productSearch.Open).toHaveBeenCalled(); + expect(state.go).toHaveBeenCalledWith('productSearchResults', {searchTerm: searchTerm}); + }); + }); }); }); From 94c524eee2bad77de01ee8292747b2f13ef724e5 Mon Sep 17 00:00:00 2001 From: Crhistian Ramirez <cramirez@four51.com> Date: Fri, 21 Apr 2017 11:41:58 -0500 Subject: [PATCH 120/158] remove accidental fdescribe --- src/app/base/tests/base.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/base/tests/base.spec.js b/src/app/base/tests/base.spec.js index 2d630f5b..2c6d5c74 100644 --- a/src/app/base/tests/base.spec.js +++ b/src/app/base/tests/base.spec.js @@ -1,4 +1,4 @@ -fdescribe('Component: Base', function() { +describe('Component: Base', function() { var q, scope, oc, From 7c77f732698b4cc6c30fbc35e28f63c35cb59404 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Mon, 24 Apr 2017 11:37:50 -0500 Subject: [PATCH 121/158] Cleanup and simplify product card layout classes OC-2057 --- src/app/styles/components/_catalog-card.less | 20 ++++--- src/app/styles/layout/_catalog-grid.less | 56 +++++--------------- 2 files changed, 22 insertions(+), 54 deletions(-) diff --git a/src/app/styles/components/_catalog-card.less b/src/app/styles/components/_catalog-card.less index 08f0c6dd..2f94d5d5 100644 --- a/src/app/styles/components/_catalog-card.less +++ b/src/app/styles/components/_catalog-card.less @@ -1,16 +1,14 @@ -@media (min-width: @screen-sm-min) { - .c-product-card { - // add flex display to product card wrapper - // flex the product card to fill the grid item element +.c-product-card { + // add flex display to product card wrapper + // flex the product card to fill the grid item element + .oc-flex-layout.vertical; + .oc-flex-layout.flex-auto; + .c-product-card__body { .oc-flex-layout.vertical; .oc-flex-layout.flex-auto; - .c-product-card__body { - .oc-flex-layout.vertical; - .oc-flex-layout.flex-auto; - } - .c-product-card__name { - .oc-flex-layout.flex-auto; - } + } + .c-product-card__name { + .oc-flex-layout.flex-auto; } } diff --git a/src/app/styles/layout/_catalog-grid.less b/src/app/styles/layout/_catalog-grid.less index 230b56cc..859a40be 100644 --- a/src/app/styles/layout/_catalog-grid.less +++ b/src/app/styles/layout/_catalog-grid.less @@ -1,48 +1,18 @@ .l-product-grid { - // use flexbox for layout on small+ screens - // add flex display to product grid wrapper margin-left: -@grid-gutter-width/6; margin-right: -@grid-gutter-width/6; + .oc-flex-layout.horizontal; + .oc-flex-layout.wrap; + .l-product-grid__item { + .oc-flex-layout.vertical; + padding-left: @grid-gutter-width/6; + padding-right: @grid-gutter-width/6; + } } -@media (max-width: @screen-xs-max) { - .l-product-grid { - .oc-flex-layout.horizontal; - .oc-flex-layout.wrap; - .thumbnail { - border: none; - } - .l-product-grid__item { - .oc-flex-layout.vertical; - padding-left: 2px; - padding-right: 2px; - body, p{ - font-size: 10px; - } - h4{ - font-size: 12px; - } - } - } -} -@media (min-width: @screen-sm-min) { - .l-product-grid { - .oc-flex-layout.horizontal; - .oc-flex-layout.wrap; - // flex each item within the grid wrapper - .l-product-grid__item { - .oc-flex-layout.vertical; - padding-left: @grid-gutter-width/6; - padding-right: @grid-gutter-width/6; - } - } - .l-category-grid { - // use flexbox for layout on small+ screens - // add flex display to product grid wrapper - .oc-flex-layout.horizontal; - .oc-flex-layout.wrap; - // flex each item within the grid wrapper - .l-category-grid__item { - .oc-flex-layout.vertical; - } - } +.l-category-grid { + .oc-flex-layout.horizontal; + .oc-flex-layout.wrap; + .l-category-grid__item { + .oc-flex-layout.vertical; + } } From ebbffd55fcd98752514096040536b6dab057106e Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Mon, 24 Apr 2017 11:38:10 -0500 Subject: [PATCH 122/158] Add documentation for productBrowse component OC-2057 --- src/app/productBrowse/README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/app/productBrowse/README.md diff --git a/src/app/productBrowse/README.md b/src/app/productBrowse/README.md new file mode 100644 index 00000000..f312435c --- /dev/null +++ b/src/app/productBrowse/README.md @@ -0,0 +1,32 @@ +# productBrowse +The Product Browse component renders a paginated list of all visible products. +``` +productBrowse/ + |- js/ + | |- productBrowse.config.js + | |- productBrowse.controller.js + | |- productBrowse.service.js + | |- productBrowseMobileCategory.modal.controller.js + | |- productBrowseProductView.controller.js + |- templates/ + | |- mobileCategory.modal.html + | |- productBrowse.html + | |- productView.html + |- tests/ + | |- productBrowse.spec.js +``` +___ +## productView.html +The Product View template contains the html for the Product List, including Product List filters and pagination. +## productBrowse.html +The Product Browse template contains the html for a Category Tree as well as the ui-view that pulls in the Product View. +## mobileCategory.modal.html +On smaller viewports, the Category Tree left nav is hidden, and replaced with a modal. +## card.product.html +Each product is represented within a Product Card. The Product Card template can be found at [common/templates/card.product.html](../common/templates/card.product.html). +## Styling +Styling for the Product Browse and Product Card components is located in the following files: + +`styles/components/_catalog-card.less` +`styles/components/_product-browse.less` +`styles/layout/_catalog-grid.less` From afd957c1bb40d5816f188b64dad578457abcc1f6 Mon Sep 17 00:00:00 2001 From: Spencer Walker <swalker@four51.com> Date: Mon, 24 Apr 2017 11:46:33 -0500 Subject: [PATCH 123/158] Add flexbox details to readme OC-2057 --- src/app/productBrowse/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/productBrowse/README.md b/src/app/productBrowse/README.md index f312435c..2dc77ee6 100644 --- a/src/app/productBrowse/README.md +++ b/src/app/productBrowse/README.md @@ -30,3 +30,5 @@ Styling for the Product Browse and Product Card components is located in the fol `styles/components/_catalog-card.less` `styles/components/_product-browse.less` `styles/layout/_catalog-grid.less` + +Flexbox is used on the Product List to set equal heights on the Product Cards. This creates a layout, and will also prevent float issues caused by the lack of a clearing element between rows. \ No newline at end of file From 86f8ba525d7e555671e25774784a3e3dcea33db3 Mon Sep 17 00:00:00 2001 From: Kyle Olson <kolson@four51.com> Date: Mon, 24 Apr 2017 16:23:17 -0500 Subject: [PATCH 124/158] Update gulp tasks for saas compatibility --- gulp.config.js | 25 ++++++++++++++++++++++--- gulp/build/inject.js | 19 +++++++++++++++++-- gulp/build/styles.js | 4 ++-- gulp/compile/app-css.js | 9 +++------ gulp/compile/index.js | 15 ++++++++++++++- package.json | 4 +++- server.js | 5 +++++ src/index.html | 3 ++- 8 files changed, 68 insertions(+), 16 deletions(-) diff --git a/gulp.config.js b/gulp.config.js index f8d2787e..c3153f88 100644 --- a/gulp.config.js +++ b/gulp.config.js @@ -1,4 +1,5 @@ var source = './src/', + moduleName = 'orderCloud', assets = 'assets/', build = './build/', bowerFiles = './bower_components/', @@ -9,7 +10,15 @@ var source = './src/', gulp_dir = './gulp/', fs = require('fs'); +try { + var saasConfig = require(source + 'app/saas/gulp.config'); +} catch(ex) { + var saasConfig = {}; +} + module.exports = { + moduleName: moduleName, + saas: saasConfig, bowerFiles: bowerFiles, npmFiles: npmFiles, src: source, @@ -32,13 +41,23 @@ module.exports = { ], scripts: [ source + 'app/**/*.js', + '!' + source + '**/saas/gulp.config.js', + '!' + source + '**/saas/app.constants.json', + '!' + source + '**/saas/documentDB/config.js', + '!' + source + '**/saas/documentDB/getConfiguration.js', '!' + source + '**/*.spec.js', '!' + source + '**/*.test.js' ], appFiles: [ build + '**/app.module.js', - build + '**/common/config/routing.js', - build + '**/common/config/*.js', + build + '**/saas/**/*.js', + build + '**/saas/oc-constants/oc-constants.js', + '!' + build + '**/saas/gulp.config.js', + '!' + build + '**/saas/app.constants.json', + '!' + build + '**/saas/documentDB/config.js', + '!' + build + '**/saas/documentDB/getConfiguration.js', + build + '**/common/config/routing/routing.js', + build + '**/common/config/**/*.js', build + '**/*s.config.js', build + '**/*.config.js', build + '**/app.run.js', @@ -59,7 +78,7 @@ module.exports = { ngConstantSettings: { name: 'orderCloud', deps: false, - constants: getConstants() + constants: saasConfig.getConstants ? saasConfig.getConstants() : getConstants() }, autoprefixerSettings: { browsers: ['last 2 versions'], diff --git a/gulp/build/inject.js b/gulp/build/inject.js index 00e86c7a..3dbd1e30 100644 --- a/gulp/build/inject.js +++ b/gulp/build/inject.js @@ -2,7 +2,8 @@ var gulp = require('gulp'), config = require('../../gulp.config'), del = require('del'), inject = require('gulp-inject'), - mainBowerFiles = require('main-bower-files'); + mainBowerFiles = require('main-bower-files'), + replace = require('gulp-replace-task'); gulp.task('clean:inject', function() { return del(config.build + '*.html'); @@ -10,7 +11,9 @@ gulp.task('clean:inject', function() { gulp.task('inject', ['clean:inject', 'scripts', 'assets', 'app-config', 'bower-fonts', 'styles'], function() { var target = gulp.src(config.index), - bowerFiles = gulp.src(mainBowerFiles({filter: ['**/*.js', '**/*.css']}), {read: false}), + bowerFiles = gulp.src(mainBowerFiles({ + filter: ['**/*.js', '**/angular-toastr.css', '**/angular-ui-tree.css', '**/tree-control.css', '**/angular-busy.css'] + }), {read: false}), appFiles = gulp.src([].concat(config.appFiles), {read: false}); return target @@ -22,5 +25,17 @@ gulp.task('inject', ['clean:inject', 'scripts', 'assets', 'app-config', 'bower-f .pipe(inject(appFiles, { ignorePath: config.build.replace('.', '') })) + .pipe(replace({ + patterns: [ + { + match:'appModule', + replacement: config.saas.moduleName || config.moduleName + }, + { + match:'conditionalStylesRef', + replacement: config.saas.moduleName ? '<link rel="stylesheet" type="text/css" href="assets/styles/styles.css">' : '' + } + ] + })) .pipe(gulp.dest(config.build)); }); diff --git a/gulp/build/styles.js b/gulp/build/styles.js index 69cb0999..04da8ed4 100644 --- a/gulp/build/styles.js +++ b/gulp/build/styles.js @@ -9,10 +9,10 @@ var gulp = require('gulp'), mainBowerFiles = require('main-bower-files'); gulp.task('clean:styles', function() { - return del(config.build + '**/*.css'); + return del([config.build + '**/*.css', config.compile + '**/*.css', config.root + '/themes/lib.less']); }); -gulp.task('styles', ['clean:styles'], StylesFunction); +gulp.task('styles', ['clean:styles'], config.saas.styles ? config.saas.styles.libLess : StylesFunction); function StylesFunction() { var browserSync = require('browser-sync').get('oc-server'); diff --git a/gulp/compile/app-css.js b/gulp/compile/app-css.js index 4dd47b21..281c9cd5 100644 --- a/gulp/compile/app-css.js +++ b/gulp/compile/app-css.js @@ -1,6 +1,5 @@ var gulp = require('gulp'), config = require('../../gulp.config'), - del = require('del'), rev = require('gulp-rev'), concatCss = require('gulp-concat-css'), filter = require('gulp-filter'), @@ -10,11 +9,9 @@ var gulp = require('gulp'), mainBowerFiles = require('main-bower-files'), csso = require('gulp-csso'); -gulp.task('clean:app-css', function() { - return del(config.compile + '**/*.css'); -}); +gulp.task('app-css', [], config.saas.styles ? config.saas.styles.libCss : AppCssFunction); -gulp.task('app-css', ['clean:app-css'], function() { +function AppCssFunction() { var lessFilter = filter('**/*.less', {restore: true}), cssFilter = filter('**/*.css'); @@ -44,4 +41,4 @@ gulp.task('app-css', ['clean:app-css'], function() { .pipe(csso()) .pipe(rev()) .pipe(gulp.dest(config.compile + config.appCss)); -}); +} \ No newline at end of file diff --git a/gulp/compile/index.js b/gulp/compile/index.js index c27b7298..04971222 100644 --- a/gulp/compile/index.js +++ b/gulp/compile/index.js @@ -1,7 +1,8 @@ var gulp = require('gulp'), config = require('../../gulp.config'), del = require('del'), - inject = require('gulp-inject'); + inject = require('gulp-inject'), + replace = require('gulp-replace-task'); gulp.task('clean-index', function() { return del(config.compile + '**/*.html'); @@ -26,5 +27,17 @@ gulp.task('index', ['clean-index', 'app-js', 'lib-js', 'app-css', 'fonts', 'imag ignorePath: config.compile.replace('./', '').replace('/', ''), addRootSlash: false })) + .pipe(replace({ + patterns: [ + { + match:'appModule', + replacement: config.saas.moduleName || config.moduleName + }, + { + match:'conditionalStylesRef', + replacement: config.saas.moduleName ? '<link rel="stylesheet" type="text/css" href="assets/styles/styles.css">' : '' + } + ] + })) .pipe(gulp.dest(config.compile)); }); diff --git a/package.json b/package.json index 2429e2d0..aefc28f0 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "homepage": "https://github.com/Four51/OrderCloud-Seed-AngularJS#readme", "dependencies": { "browser-sync": "2.11.1", + "cookie-parser": "1.4.3", "del": "2.2.0", "express": "4.13.4", "fs": "0.0.2", @@ -61,6 +62,7 @@ "gulp-ng-annotate": "1.1.0", "gulp-ng-constant": "1.1.0", "gulp-nodemon": "2.0.6", + "gulp-replace-task": "0.11.0", "gulp-rev": "6.0.1", "gulp-sourcemaps": "1.6.0", "gulp-uglify": "1.5.1", @@ -79,4 +81,4 @@ "karma-ng-html2js-preprocessor": "1.0.0", "karma-phantomjs-launcher": "1.0.2" } -} \ No newline at end of file +} diff --git a/server.js b/server.js index 4bcaacb0..ec9e8cfa 100644 --- a/server.js +++ b/server.js @@ -6,6 +6,11 @@ var express = require('express'), app = express(), port = process.env.PORT || 451; +if (config.saas.getAppConfig) { + app.use(cookieParser()); + app.use(config.saas.getAppConfig()); +} + switch(env) { case 'production': console.log('*** PROD ***'); diff --git a/src/index.html b/src/index.html index a479374c..a9f5d681 100644 --- a/src/index.html +++ b/src/index.html @@ -4,13 +4,14 @@ <meta charset="utf-8" /> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/> <!-- OrderCloud will appear as the tab's title until Angular loads application.title's value --> - <title ng-bind="application.$state.current.data.pageTitle + (application.$state.current.data.pageTitle ? ' | ' : '') + application.name">OrderCloud + OrderCloud + @@conditionalStylesRef From a1d5da2c7967d2166a53c0d5018f7f407cd3654d Mon Sep 17 00:00:00 2001 From: Kyle Olson Date: Mon, 24 Apr 2017 16:24:54 -0500 Subject: [PATCH 125/158] Add ocAppName Service --- src/README.md | 2 +- src/app/app.controller.js | 4 ++-- src/app/base/templates/base.html | 6 +++--- src/app/base/templates/navigation.html | 2 +- .../services/oc-app-name/oc-app-name.js | 21 +++++++++++++++++++ src/app/home/templates/home.html | 2 +- 6 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 src/app/common/services/oc-app-name/oc-app-name.js diff --git a/src/README.md b/src/README.md index 209e5b5f..4856a2a4 100644 --- a/src/README.md +++ b/src/README.md @@ -32,7 +32,7 @@ constant. You can see how we are referencing the `AppCtrl` via the controllerAs ```html //dynamic application title - +<title ng-bind="application.$state.current.data.pageTitle + (application.$state.current.data.pageTitle ? ' | ' : '') + application.name()"> OrderCloud ``` diff --git a/src/app/app.controller.js b/src/app/app.controller.js index c93e25f2..724fa5b0 100644 --- a/src/app/app.controller.js +++ b/src/app/app.controller.js @@ -2,9 +2,9 @@ angular.module('orderCloud') .controller('AppCtrl', AppController) ; -function AppController($state, $ocMedia, LoginService, appname, ocStateLoading, ocIsTouchDevice, ocRoles) { +function AppController($state, $ocMedia, LoginService, ocAppName, ocStateLoading, ocIsTouchDevice, ocRoles) { var vm = this; - vm.name = appname; + vm.name = ocAppName.Watch; vm.$state = $state; vm.$ocMedia = $ocMedia; vm.isTouchDevice = ocIsTouchDevice; diff --git a/src/app/base/templates/base.html b/src/app/base/templates/base.html index 467afb51..eca43521 100644 --- a/src/app/base/templates/base.html +++ b/src/app/base/templates/base.html @@ -4,7 +4,7 @@ -->
    diff --git a/src/app/base/templates/navigation.html b/src/app/base/templates/navigation.html index bde4da38..16ae5e19 100644 --- a/src/app/base/templates/navigation.html +++ b/src/app/base/templates/navigation.html @@ -1,7 +1,7 @@