Merge pull request #23 from communities/master

Master -> Main

Author: AshRelateIQ

examples/lwc/force-app/main/default/lwc/paymentMethod/constants.js

@@ -5,7 +5,6 @@ export const PaymentTypeEnum  = Object.freeze({
 
 export const labels  = {
     paymentMethodHeader: 'Payment Method',
-    buttonLabel: 'Submit Payment',
     purchaseOrderOptionLabel: 'Purchase Order',
     purchaseOrderEntryHeader: 'Enter PO Number',
     cardPaymentOptionLabel: 'Credit Card'

examples/lwc/force-app/main/default/lwc/paymentMethod/paymentMethod.html

@@ -106,10 +106,16 @@
         </div>
     </div>
 
+    <!-- Navigation buttons -->
     <div class="slds-card__footer slds-p-vertical_x-small">
+        <div class="slds-button slds-button_brand">
+            <a href="javascript:void(0)" onclick={handlePreviousButton}
+                >{previousButtonLabel}</a
+            >
+        </div>
         <div class="slds-button slds-button_brand">
             <a href="javascript:void(0)" onclick={handlePaymentButton}
-                >{labels.buttonLabel}</a
+                >{nextButtonLabel}</a
             >
         </div>
     </div>

examples/lwc/force-app/main/default/lwc/paymentMethod/paymentMethod.js

@@ -1,5 +1,5 @@
 import { LightningElement, api, track } from 'lwc';
-import { FlowNavigationNextEvent } from 'lightning/flowSupport';
+import { FlowNavigationNextEvent, FlowNavigationBackEvent } from 'lightning/flowSupport';
 import * as Constants from './constants';
 
 import getPaymentInfo from '@salesforce/apex/B2BPaymentController.getPaymentInfo';
@@ -10,6 +10,7 @@ import setPayment from '@salesforce/apex/B2BPaymentController.setPayment';
  * and to fill out the required information for the chosen type.
  *
  * @fires FlowNavigationNextEvent
+ * @fires FlowNavigationBackEvent
  * @fires PaymentMethod#submitpayment
  */
 export default class PaymentMethod extends LightningElement {
@@ -100,6 +101,18 @@ export default class PaymentMethod extends LightningElement {
      */
     @api hideCreditCard = false;
 
+    /**
+     * Text to display on the Previous button. Defaults to "Previous".
+     * @type {String}
+     */
+    @api previousButtonLabel = 'Previous';
+
+    /**
+     * Text to display on the Next button. Defaults to "Next".
+     * @type {String}
+     */
+    @api nextButtonLabel = 'Next';
+
     /**
      * The list of labels used in the cmp. 
      * @type {String}
@@ -286,6 +299,15 @@ export default class PaymentMethod extends LightningElement {
         this._selectedPaymentType = event.currentTarget.value;
     }
 
+    /**
+     * Navigates to the previous page. Doesn't save any information, so that information is lost on clicking
+     * Previous.
+     */
+    handlePreviousButton() {
+        const navigatePreviousEvent = new FlowNavigationBackEvent();
+        this.dispatchEvent(navigatePreviousEvent);
+    }
+
     /**
      * Handler for the 'click' event fired from the payment button.
      * If PO Number is selected, make an apex call to set the new values.

examples/lwc/force-app/main/default/lwc/paymentMethod/paymentMethod.js-meta.xml

@@ -26,6 +26,9 @@
             <property name="hideCvv" label="Hide CVV" type="Boolean" description="" default="false" role="inputOnly"/>
             <property name="hideExpiryMonth" label="Hide Expiry Month" type="Boolean" description="" default="false" role="inputOnly"/>
             <property name="hideExpiryYear" label="Hide Expiry Year" type="Boolean" description="" default="false" role="inputOnly"/>
+            <!-- Labels -->
+            <property name="previousButtonLabel" label="Previous Button Label" type="String" description="The text string to place on the Previous button" default="Previous" role="inputOnly"/>
+            <property name="nextButtonLabel" label="Next Button Label" type="String" description="The text string to place on the Next button" default="Next" role="inputOnly"/>
             <!-- OUTPUT only fields-->
             <property name="selectedBillingAddress" label="Selected Billing Address ID" type="String" description="The address ID" role="outputOnly"/>
             <property name="purchaseOrderNumber" label="Purchase Order Number" type="String" description="The entered purchase order number" role="outputOnly" />

sfdx/convert-examples-to-sfdx.sh

@@ -8,7 +8,7 @@ while getopts f: flag
 do
     case "${flag}" in
         f) flow=${OPTARG}
-        flow=`echo "${flow}"` # Ensure lower case
+        flow=`echo "$flow" | awk '{print tolower($0)}'` # Force to lowercase
          ;;
     esac
 done
@@ -26,7 +26,9 @@ sfdx force:mdapi:convert -r ../examples/checkout/integrations/
 sfdx force:mdapi:convert -r ../tests/integration/
 
 # Payments related changes
-mkdir force-app/main/default/lwc/
+newdir="force-app/main/default/lwc/"
+[ -d "$newdir" ] || mkdir $newdir
+
 cp ../examples/lwc/force-app/main/default/classes/B2BGetInfo.cls* force-app/main/default/classes/
 cp ../examples/lwc/force-app/main/default/classes/B2BUtils.cls* force-app/main/default/classes/
 cp ../examples/lwc/force-app/main/default/classes/B2BPaymentController* force-app/main/default/classes/