Merge pull request #12991 from albertkol/fix-technical-user-error

Fix techinical user error
canonical · Jul 3, 2023 · 1caab18 · 1caab18
2 parents 221e388 + f88315f
commit 1caab18
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/...advantage/react/components/Subscriptions/SubscriptionDetails/SubscriptionDetails.test.tsx b/...advantage/react/components/Subscriptions/SubscriptionDetails/SubscriptionDetails.test.tsx
@@ -445,7 +445,9 @@ describe("SubscriptionDetails", () => {
     const contract = userSubscriptionFactory.build({
       type: UserSubscriptionType.Monthly,
       statuses: userSubscriptionStatusesFactory.build({
+        is_subscription_active: true,
         is_renewed: true,
+        is_cancelled: false,
       }),
     });
 
@@ -467,6 +469,7 @@ describe("SubscriptionDetails", () => {
     const contract = userSubscriptionFactory.build({
       type: UserSubscriptionType.Monthly,
       statuses: userSubscriptionStatusesFactory.build({
+        is_subscription_active: true,
         is_renewed: false,
       }),
     });
@@ -535,7 +538,9 @@ describe("SubscriptionDetails", () => {
     const contract = userSubscriptionFactory.build({
       type: UserSubscriptionType.Trial,
       statuses: userSubscriptionStatusesFactory.build({
+        is_subscription_active: true,
         is_renewed: true,
+        is_cancelled: false,
       }),
     });
 

diff --git a/.../src/advantage/react/components/Subscriptions/SubscriptionDetails/SubscriptionDetails.tsx b/.../src/advantage/react/components/Subscriptions/SubscriptionDetails/SubscriptionDetails.tsx
@@ -155,39 +155,51 @@ export const SubscriptionDetails = forwardRef<HTMLDivElement, Props>(
                   {subscription.type == "monthly" ||
                   subscription.type == "yearly" ? (
                     <>
-                      {subscription.statuses.is_renewed ? (
-                        <button className="p-chip--positive">
-                          <span className="p-chip__value">Auto-renewal on</span>
-                        </button>
-                      ) : (
+                      {subscription.statuses.is_subscription_active &&
+                      !subscription.statuses.is_cancelled ? (
                         <>
-                          {!subscription.statuses.is_cancelled ? (
+                          {subscription.statuses.is_renewed ? (
+                            <button className="p-chip--positive">
+                              <span className="p-chip__value">
+                                Auto-renewal on
+                              </span>
+                            </button>
+                          ) : null}
+                          {!subscription.statuses.is_renewed ? (
                             <button className="p-chip--caution">
                               <span className="p-chip__value">
                                 Auto-renewal off
                               </span>
                             </button>
-                          ) : (
-                            <button className="p-chip--negative">
-                              <span className="p-chip__value">Cancelled</span>
-                            </button>
-                          )}
+                          ) : null}
                         </>
-                      )}
+                      ) : null}
+                      {subscription.statuses.is_cancelled ? (
+                        <button className="p-chip--negative">
+                          <span className="p-chip__value">Cancelled</span>
+                        </button>
+                      ) : null}
                     </>
                   ) : null}
                   {subscription.type == "trial" ? (
                     <>
+                      {subscription.statuses.is_subscription_active ? (
+                        <>
+                          {subscription.statuses.is_renewed &&
+                          !subscription.statuses.is_cancelled ? (
+                            <button className="p-chip--positive">
+                              <span className="p-chip__value">
+                                Auto-renewal on
+                              </span>
+                            </button>
+                          ) : null}
+                        </>
+                      ) : null}
                       {subscription.statuses.is_cancelled ? (
                         <button className="p-chip--negative">
                           <span className="p-chip__value">Cancelled</span>
                         </button>
                       ) : null}
-                      {subscription.statuses.is_renewed ? (
-                        <button className="p-chip--positive">
-                          <span className="p-chip__value">Auto-renewal on</span>
-                        </button>
-                      ) : null}
                     </>
                   ) : null}
                 </>

diff --git a/webapp/shop/api/ua_contracts/helpers.py b/webapp/shop/api/ua_contracts/helpers.py
@@ -242,7 +242,7 @@ def get_user_subscription_statuses(
         statuses["has_pending_purchases"] = True
         return statuses
 
-    if type == "trial":
+    if type == "trial" and account.role != "technical":
         active_trial = [
             subscription
             for subscription in subscriptions
@@ -273,7 +273,7 @@ def get_user_subscription_statuses(
             and not statuses["is_cancelled"]
         )
 
-    if type in ["yearly", "monthly"]:
+    if type in ["yearly", "monthly"] and account.role != "technical":
         statuses["is_subscription_active"] = is_billing_subscription_active(
             subscriptions, subscription_id
         )