Merge pull request #125 from Southern-Exposure-Seed-Exchange/develop

Propagate switch to Stripe to master

Author: s-and-witch

.github/workflows/main.yml

@@ -122,6 +122,7 @@ jobs:
       - name: Prepare env
         run: |
           echo "HELCIM_ENV=${{ github.ref == 'refs/heads/master' && 'production' || 'staging' }}" >> $GITHUB_ENV
+          echo "STRIPE_ENV=${{ github.ref == 'refs/heads/master' && 'production' || 'staging' }}" >> $GITHUB_ENV
           echo "POSTGRID_ENV=${{ github.ref == 'refs/heads/master' && 'production' || 'staging' }}" >> $GITHUB_ENV
           echo "GA_MEASUREMENT_ID='UA-5070189-1'" >> $GITHUB_ENV
 
@@ -148,5 +149,6 @@ jobs:
           cache-to: type=gha,mode=max
           build-args: |
             HELCIM_ENV
+            STRIPE_ENV
             GA_MEASUREMENT_ID
             POSTGRID_ENV

Dockerfile

@@ -30,6 +30,8 @@ RUN npm --prefix client install
 COPY client ./client
 ARG HELCIM_ENV
 ENV HELCIM_ENV=$HELCIM_ENV
+ARG STRIPE_ENV
+ENV STRIPE_ENV=$STRIPE_ENV
 ARG POSTGRID_ENV
 ENV POSTGRID_ENV=$POSTGRID_ENV
 ARG GA_MEASUREMENT_ID

client/src/Data/Api.elm

@@ -2,9 +2,10 @@ module Data.Api exposing
     ( Endpoint(..), get, post, put, patch, delete
     , withJsonBody, withStringResponse, withJsonResponse, withStringErrorHandler, withErrorHandler
     , sendRequest
-    , FormErrors, initialErrors, addError, addErrors, prefixedArrayErrors
+    , FormErrors, initialErrors, addError, prefixedArrayErrors
     , apiFailureToError, formErrorsDecoder
     , errorHtml, generalFormErrors, getErrorHtml
+    , addErrors
     )
 
 {-|
@@ -79,8 +80,10 @@ type Endpoint
     | CheckoutPlaceOrderAnonymous
     | CheckoutSuccess
     | GuestCheckoutSuccess
-    | CheckoutHelcimToken
-    | CheckoutHelcimTokenAnonymous
+    | HelcimValidateCheckout
+    | HelcimValidateCheckoutAnonymous
+    | StripeValidateCheckout
+    | StripeValidateCheckoutAnonymous
     | AdminCategoryList
     | AdminNewCategory
     | AdminEditCategoryData CategoryId
@@ -244,12 +247,18 @@ toUrl endpoint =
                 GuestCheckoutSuccess ->
                     joinPath [ "checkout", "anonymous-success" ]
 
-                CheckoutHelcimToken ->
+                HelcimValidateCheckout ->
                     joinPath [ "checkout", "helcim-checkout-token" ]
 
-                CheckoutHelcimTokenAnonymous ->
+                HelcimValidateCheckoutAnonymous ->
                     joinPath [ "checkout", "anonymous-helcim-checkout-token" ]
 
+                StripeValidateCheckout ->
+                    joinPath [ "checkout", "validate-customer-details" ]
+
+                StripeValidateCheckoutAnonymous ->
+                    joinPath [ "checkout", "validate-anonymous-customer-details" ]
+
                 AdminCategoryList ->
                     joinPath [ "admin", "categories", "list" ]
 
@@ -582,6 +591,7 @@ addError : Field -> ErrorMessage -> FormErrors -> FormErrors
 addError field message errors =
     addErrors field [ message ] errors
 
+
 addErrors : Field -> List ErrorMessage -> FormErrors -> FormErrors
 addErrors field messages errors =
     (\a -> Dict.update field a errors) <|