Merge branch 'main' into alk/add-security-for-gh-actions

tighten · Aug 31, 2022 · 28481ea · 28481ea
2 parents 3d6c365 + 06c76e0
commit 28481ea
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 26 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -16,9 +16,13 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        php: [8.0, 8.1]
+        php: [7.4, 8.0, 8.1]
         laravel: [8.*, 9.*]
         include:
+          - php: 7.4
+            laravel: 8.*
+            testbench: 6.*
+            phpunit: 9.*
           - php: 8.0
             laravel: 8.*
             testbench: 6.*
@@ -35,6 +39,9 @@ jobs:
             laravel: 9.*
             testbench: 7.*
             phpunit: 9.*
+        exclude:
+          - php: 7.4
+            laravel: 9.*
     services:
       stripemock:
         image: stripe/stripe-mock:v0.141.0

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         }
     ],
     "require": {
-        "php": "^8.0|^8.1",
+        "php": "^7.4|^8.0|^8.1",
         "stripe/stripe-php": ">=5.0"
     },
     "require-dev": {

diff --git a/dist/css/tool.css b/dist/css/tool.css
diff --git a/dist/js/tool.js b/dist/js/tool.js
diff --git a/dist/lang/en.json b/dist/lang/en.json
@@ -13,7 +13,7 @@
     "Delinquent": "Delinquent",
     "Description": "Description",
     "Discount": "Discount",
-    "Dispute": "Dispute",
+    "Disputed": "Disputed",
     "Email": "Email",
     "Fee": "Fee",
     "Fraud Details": "Fraud Details",
@@ -25,6 +25,7 @@
     "Net": "Net",
     "Next Invoice Sequence": "Next Invoice Sequence",
     "Next": "Next",
+    "Outcome": "Outcome",
     "Paid": "Paid",
     "Pending Balance": "Pending Balance",
     "Phone": "Phone",

diff --git a/resources/js/components/ColumnSelect.vue b/resources/js/components/ColumnSelect.vue
@@ -12,15 +12,15 @@
             <template #menu>
                 <DropdownMenu
                     style="width: 100%; columns: 25vw 3"
-                    class="p-3 text-90"
+                    class="ns-p-3 ns-text-90"
                 >
                     <div
                         v-if="resource"
                         v-for="(value, key) in resource"
-                        class="m-2"
+                        class="ns-m-2"
                     >
                         <input
-                            class="mr-2"
+                            class="ns-mr-2"
                             type="checkbox"
                             :id="key"
                             :value="key"

diff --git a/resources/js/components/cards/ChargeDetailCard.vue b/resources/js/components/cards/ChargeDetailCard.vue
@@ -1,5 +1,5 @@
 <template>
-    <LoadingCard :loading="initialLoading" class="mb-6 px-6">
+    <LoadingCard :loading="initialLoading" class="ns-mb-6 ns-px-6">
         <DetailTextField
             :field="{ name: __('ID'), value: charge.id }"
         ></DetailTextField>
@@ -24,9 +24,20 @@
                 value: $filters.date(charge.created),
             }"
         ></DetailTextField>
-        <DetailTextField
-            :field="{ name: __('Metadata'), value: charge.metadata }"
-        ></DetailTextField>
+        <DetailKeyValueField
+            v-if="!initialLoading && !!Object.keys(charge.metadata).length"
+            :field="{
+                name: __('Metadata'),
+                value: charge.metadata,
+            }"
+        ></DetailKeyValueField>
+        <DetailKeyValueField
+            v-if="!initialLoading && !!Object.keys(charge.outcome).length"
+            :field="{
+                name: __('Outcome'),
+                value: charge.outcome,
+            }"
+        ></DetailKeyValueField>
         <DetailBooleanField
             :field="{ name: __('Livemode'), value: charge.livemode }"
         ></DetailBooleanField>
@@ -39,12 +50,16 @@
         <DetailBooleanField
             :field="{ name: __('Refunded'), value: charge.refunded }"
         ></DetailBooleanField>
-        <DetailTextField
-            :field="{ name: __('Dispute'), value: charge.dispute }"
-        ></DetailTextField>
-        <DetailTextField
-            :field="{ name: __('Fraud Details'), value: charge.fraud_details }"
-        ></DetailTextField>
+        <DetailBooleanField
+            :field="{ name: __('Disputed'), value: charge.disputed }"
+        ></DetailBooleanField>
+        <DetailKeyValueField
+            v-if="!initialLoading && !!Object.keys(charge.fraud_details).length"
+            :field="{
+                name: __('Fraud Details'),
+                value: charge.fraud_details,
+            }"
+        ></DetailKeyValueField>
         <DetailTextField
             :field="{
                 name: __('Transfer Group'),

diff --git a/resources/js/components/cards/CustomerDetailCard.vue b/resources/js/components/cards/CustomerDetailCard.vue
@@ -1,5 +1,5 @@
 <template>
-    <LoadingCard :loading="initialLoading" class="mb-6 px-6">
+    <LoadingCard :loading="initialLoading" class="ns-mb-6 ns-px-6">
         <DetailTextField
             :field="{ name: __('ID'), value: customer.id }"
         ></DetailTextField>
@@ -117,7 +117,7 @@ export default {
         formatAddress(address) {
             return address?.line1
                 ? `${address.line1}
-                    ${address.line2} 
+                    ${address.line2}
                     ${address.city},
                     ${address.state}
                     ${address.postal_code}`