Updated sg_changes overlay

Author: kswardsf

cartridges/kount_sg_changes/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>int_kount</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.demandware.studio.core.beehiveElementBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.demandware.studio.core.beehiveNature</nature>
+	</natures>
+</projectDescription>

…ont_controllers/controllers/COBilling.js …anges/cartridge/controllers/COBilling.jscartridges/kount_sg_changes/cartridge/app_storefront_controllers/controllers/COBilling.js renamed to cartridges/kount_sg_changes/cartridge/controllers/COBilling.js cartridges/kount_sg_changes/cartridge/app_storefront_controllers/controllers/COBilling.js renamed to cartridges/kount_sg_changes/cartridge/controllers/COBilling.js

@@ -19,11 +19,11 @@ var Status = require('dw/system/Status');
 var StringUtils = require('dw/util/StringUtils');
 var Transaction = require('dw/system/Transaction');
 var URLUtils = require('dw/web/URLUtils');
-var Countries = require('app_storefront_core/cartridge/scripts/util/Countries');
+var Countries = require('*/cartridge/scripts/util/Countries');
 
 /* Script Modules */
-var app = require('~/cartridge/scripts/app');
-var guard = require('~/cartridge/scripts/guard');
+var app = require('*/cartridge/scripts/app');
+var guard = require('*/cartridge/scripts/guard');
 
 /* Kount */
 var Kount = require('int_kount/cartridge/scripts/kount/LibKount');
@@ -80,7 +80,7 @@ function initEmailAddress(cart) {
  * @param {object} params - (optional) if passed, added to view properties so they can be accessed in the template.
  */
 function returnToForm(cart, params) {
-    var pageMeta = require('~/cartridge/scripts/meta');
+    var pageMeta = require('*/cartridge/scripts/meta');
 
     // if the payment method is set to gift certificate get the gift certificate code from the form
     if (!empty(cart.getPaymentInstrument()) && cart.getPaymentInstrument().getPaymentMethod() === PaymentInstrument.METHOD_GIFT_CERTIFICATE) {
@@ -94,10 +94,10 @@ function returnToForm(cart, params) {
     });
 
     if (params) {
-        app.getView(require('~/cartridge/scripts/object').extend(params, {
+        app.getView('*/cartridge/scripts/object').extend(params, {
             Basket: cart.object,
             ContinueURL: URLUtils.https('COBilling-Billing')
-        })).render('checkout/billing/billing');
+        }).render('checkout/billing/billing');
     } else {
         app.getView({
             Basket: cart.object,
@@ -120,7 +120,7 @@ function start(cart, params) {
         cart.calculate();
     });
 
-    var pageMeta = require('~/cartridge/scripts/meta');
+    var pageMeta = require('*/cartridge/scripts/meta');
     pageMeta.update({
         pageTitle: Resource.msg('billing.meta.pagetitle', 'checkout', 'SiteGenesis Checkout')
     });
@@ -180,7 +180,7 @@ function publicStart() {
         var creditCardList = initCreditCardList(cart);
         var applicablePaymentMethods = creditCardList.ApplicablePaymentMethods;
 
-        var params = require('~/cartridge/scripts/object').extend({ApplicableCreditCards: creditCardList.ApplicableCreditCards}, arguments[0]);
+        var params = require('*/cartridge/scripts/object').extend({ApplicableCreditCards: creditCardList.ApplicableCreditCards}, arguments[0]);
         var billingForm = app.getForm('billing').object;
         var paymentMethods = billingForm.paymentMethods;
         if (paymentMethods.valid) {
@@ -586,7 +586,7 @@ function redeemGiftCertificateJson() {
     giftCertCode = request.httpParameterMap.giftCertCode.stringValue;
     giftCertStatus = redeemGiftCertificate(giftCertCode);
 
-    let responseUtils = require('~/cartridge/scripts/util/Response');
+    let responseUtils = require('*/cartridge/scripts/util/Response');
 
     if (request.httpParameterMap.format.stringValue !== 'ajax') {
         // @FIXME we could also build an ajax guard?
@@ -699,7 +699,7 @@ function editBillingAddress() {
  */
 function getGiftCertificateBalance() {
     var giftCertificate = GiftCertificateMgr.getGiftCertificateByCode(request.httpParameterMap.giftCertificateID.value);
-    var responseUtils = require('~/cartridge/scripts/util/Response');
+    var responseUtils = require('*/cartridge/scripts/util/Response');
 
     if (giftCertificate && giftCertificate.isEnabled()) {
         responseUtils.renderJSON({

…_controllers/controllers/COPlaceOrder.js …es/cartridge/controllers/COPlaceOrder.jscartridges/kount_sg_changes/cartridge/app_storefront_controllers/controllers/COPlaceOrder.js renamed to cartridges/kount_sg_changes/cartridge/controllers/COPlaceOrder.js cartridges/kount_sg_changes/cartridge/app_storefront_controllers/controllers/COPlaceOrder.js renamed to cartridges/kount_sg_changes/cartridge/controllers/COPlaceOrder.js

@@ -17,8 +17,8 @@ var Status = require('dw/system/Status');
 var Transaction = require('dw/system/Transaction');
 
 /* Script Modules */
-var app = require('~/cartridge/scripts/app');
-var guard = require('~/cartridge/scripts/guard');
+var app = require('*/cartridge/scripts/app');
+var guard = require('*/cartridge/scripts/guard');
 
 /* Kount */
 var Kount = require('int_kount/cartridge/scripts/kount/LibKount');

…controllers/scripts/models/OrderModel.js …s/cartridge/scripts/models/OrderModel.jscartridges/kount_sg_changes/cartridge/app_storefront_controllers/scripts/models/OrderModel.js renamed to cartridges/kount_sg_changes/cartridge/scripts/models/OrderModel.js cartridges/kount_sg_changes/cartridge/app_storefront_controllers/scripts/models/OrderModel.js renamed to cartridges/kount_sg_changes/cartridge/scripts/models/OrderModel.js

@@ -71,7 +71,7 @@
         </isif>
 
         <isscript>
-            var currentCountry = require('~/cartridge/scripts/util/Countries').getCurrent(pdict);
+            var currentCountry = require('*/cartridge/scripts/util/Countries').getCurrent(pdict);
         </isscript>
         <isdynamicform formobject="${pdict.CurrentForms.billing.billingAddress.addressFields}" formdata="${currentCountry.dynamicForms.addressDetails}"/>
 

…es/default/checkout/billing/billing.isml …es/default/checkout/billing/billing.ismlcartridges/kount_sg_changes/cartridge/app_storefront_core/templates/default/checkout/billing/billing.isml renamed to cartridges/kount_sg_changes/cartridge/templates/default/checkout/billing/billing.isml cartridges/kount_sg_changes/cartridge/app_storefront_core/templates/default/checkout/billing/billing.isml renamed to cartridges/kount_sg_changes/cartridge/templates/default/checkout/billing/billing.isml

@@ -86,7 +86,7 @@
 					<span>${Resource.msg('billing.creditcardlistexpdate', 'checkout', null)}</span>
 				</label>
 				<isscript>
-					var currentCountry = require('~/cartridge/scripts/util/Countries').getCurrent(pdict);
+					var currentCountry = require('*/cartridge/scripts/util/Countries').getCurrent(pdict);
 				</isscript>
 
 				<isdynamicform formobject="${pdict.CurrentForms.billing.paymentMethods.creditCard.expiration}" formdata="${currentCountry.dynamicForms.expirationInfo}"/>