From 7f2e812a80c0d195688b18004d6d1a9cdfd7e49b Mon Sep 17 00:00:00 2001
From: Charlon Palacay <charlon@gmail.com>
Date: Fri, 26 Jul 2024 15:12:30 -0700
Subject: [PATCH 1/2] Removes unused package. Breaks ARM based mac builds.

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index d10c4b59f..2b81f88b4 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     "babel-loader": "8.2.2",
     "bootstrap": "5.1.0",
     "browserslist": "4.16.6",
-    "canvas": "2.11.2",
     "clean-webpack-plugin": "4.0.0",
     "core-js": "3.35.1",
     "css-loader": "5.2.7",

From d1fda5279ae15b910834046069610f3bea7aa787 Mon Sep 17 00:00:00 2001
From: Fang Lin <fanglin@uw.edu>
Date: Tue, 6 Aug 2024 13:31:54 -0700
Subject: [PATCH 2/2] MUWM-5351 (#3137)

Resolve MUWM-5351
-----------------
Co-authored-by: William Washington <will.wash@gmail.com>
---
 myuw_vue/components/accounts/tuition-fees.vue | 73 +++++++++++++------
 myuw_vue/mixins/utils.js                      | 16 +++-
 myuw_vue/tests/mixins.test.js                 | 10 +++
 myuw_vue/tests/tuition.test.js                |  1 +
 4 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/myuw_vue/components/accounts/tuition-fees.vue b/myuw_vue/components/accounts/tuition-fees.vue
index 9cbb78842..6b41e6e47 100644
--- a/myuw_vue/components/accounts/tuition-fees.vue
+++ b/myuw_vue/components/accounts/tuition-fees.vue
@@ -9,10 +9,14 @@
       <h2 class="h4 mb-3 text-dark-beige myuw-font-encode-sans">Tuition &amp; Fees</h2>
     </template>
     <template #card-body>
-      <div style="text-align: center">
+      <div>
+        <div v-if="hasIacData" role="alert" class="alert alert-warning myuw-text-md">
+          <strong>Digital material fees are not included in tuition</strong>, they must be paid
+          separately below under "UW Day One Access Fees."
+        </div>
         <div
           v-if="hasTuitionDate && tuitionDateFromNow === 'Today' && tuiBalance > 0"
-          class="alert alert-danger text-danger"
+          class="alert alert-danger text-danger" style="text-align: center"
           role="alert"
         >
           <font-awesome-icon :icon="faExclamationTriangle" /> Tuition and fees are due today.
@@ -41,14 +45,16 @@
                 <div class="flex-fill w-50">Student Fiscal Services</div>
                 <div class="flex-fill w-50 text-end">
                   <a href="https://sdb.admin.uw.edu/sisStudents/uwnetid/tuition.aspx"
-                  >Tuition Statement</a>
+                    >Tuition Statement</a
+                  >
                 </div>
               </div>
               <div v-if="tuiBalance != 0" class="text-end">
                 <uw-link-button
                   v-out="'Make tuition payment'"
                   href="http://f2.washington.edu/fm/sfs/tuition/payment"
-                >Make payment</uw-link-button>
+                  >Make payment</uw-link-button
+                >
               </div>
             </template>
           </uw-card-status>
@@ -64,7 +70,8 @@
                 <div class="flex-fill w-50 text-end">
                   No payment needed<br />
                   <a href="https://sdb.admin.uw.edu/sisStudents/uwnetid/tuition.aspx"
-                  >Tuition Statement</a>
+                    >Tuition Statement</a
+                  >
                 </div>
               </div>
             </template>
@@ -84,7 +91,8 @@
                   <uw-link-button
                     v-out="'Make Continuum College tuition payment'"
                     href="http://portal.continuum.uw.edu"
-                  >Make payment</uw-link-button>
+                    >Make payment</uw-link-button
+                  >
                 </div>
               </div>
             </template>
@@ -103,7 +111,8 @@
                     v-out="'Continuum College Account Statement'"
                     href="http://portal.continuum.uw.edu"
                     class="myuw-text-md"
-                  >Account Statement</a>
+                    >Account Statement</a
+                  >
                 </div>
               </div>
             </template>
@@ -129,17 +138,24 @@
           <div class="alert alert-warning myuw-text-md" role="alert">
             <p>
               One or more of your enrolled courses provides you access to
-              <a :href="textbooksUrl">required digital materials</a>,
-              in Canvas, on or before the first day of class.
+              <a :href="textbooksUrl">required digital materials</a>, in Canvas, on or before the
+              first day of class.
             </p>
             <p class="mb-0">
-              <strong>To maintain access to these materials at Day One Access pricing,
-              you must pay for these materials</strong>.
+              <strong
+                >To maintain access to these materials at Day One Access pricing, you must pay for
+                these materials</strong
+              >.
               <a href="https://www.ubookstore.com/day-one-access-faq"
-              >About the Day One Access Program</a>.
+                >About the Day One Access Program</a
+              >.
             </p>
           </div>
-          <uw-card-status>
+          <div v-if="dayOneAccessOverDue" role="alert" class="alert alert-danger myuw-text-md">
+            <strong>The payment deadline has passed.</strong> To learn about your options, please
+            email <a href="mailto:dayoneaccess@ubookstore.com">dayoneaccess@ubookstore.com</a>.
+          </div>
+          <uw-card-status v-else>
             <template #status-label>Amount Due</template>
             <template v-if="iacData.balance > 0" #status-value>
               <span class="text-danger">${{ iacData.balance.toFixed(2) }}</span>
@@ -153,14 +169,15 @@
                   <uw-link-button
                     v-out="'Make bookstore payment'"
                     :href="iacData.bookstore_checkout_url"
-                  >Make payment</uw-link-button>
+                    >Make payment</uw-link-button
+                  >
                 </div>
               </div>
             </template>
           </uw-card-status>
         </li>
 
-        <li v-if="hasIacData && iacData.balance > 0 && Boolean(iacData.payment_due_day)">
+        <li v-if="hasIacData && iacData.balance > 0 && !dayOneAccessOverDue">
           <uw-card-status>
             <template #status-label>Payment Due</template>
             <template #status-value>
@@ -180,7 +197,8 @@
           <a
             v-out="'Give Tuition Account Access'"
             href="https://sdb.admin.uw.edu/sisStudents/uwnetid/release.aspx"
-          >Give access to your tuition account and financial aid information</a>
+            >Give access to your tuition account and financial aid information</a
+          >
           to parents or other third parties.
         </p>
         <p v-for="(msg, i) in pceTuitionDup" :key="i">
@@ -195,7 +213,8 @@
               <a
                 href="https://sdb.admin.uw.edu/sisStudents/uwnetid/finaidstatus.aspx"
                 class="myuw-text-md"
-              >Financial Aid Status</a>
+                >Financial Aid Status</a
+              >
             </li>
           </ul>
         </template>
@@ -209,11 +228,15 @@
         <a
           v-out="'Tuition Statement'"
           href="https://sdb.admin.uw.edu/sisStudents/uwnetid/tuition.aspx"
-        >Tuition Statement</a> page.
+          >Tuition Statement</a
+        >
+        page.
       </span>
       <span v-else>
         <a v-out="'Continuum College Tuition portal'" href="https://portal.continuum.uw.edu"
-        >PCE Tuition</a> portal.
+          >PCE Tuition</a
+        >
+        portal.
       </span>
     </template>
     <template #card-error-extra>
@@ -344,18 +367,20 @@ export default {
     },
     hasIacData() {
       // MUWM-5272
-      return (
-        (this.seaStud || this.botStud) && this.iacData &&
-         this.iacData.bookstore_checkout_url);
+      return (this.seaStud || this.botStud) && this.iacData && this.iacData.bookstore_checkout_url;
     },
     dayOneAccessDueDateFromNow() {
       // MUWM-5272
       return this.toFromNowDate(this.iacData.payment_due_day);
     },
+    dayOneAccessOverDue() {
+      // MUWM-5351
+      return this.hasPassed(this.iacData.payment_due_day);
+    },
     textbooksUrl() {
       // MUWM-5272
-      return "/textbooks/" + this.iacData.year + ',' +  this.iacData.quarter;
-    }
+      return '/textbooks/' + this.iacData.year + ',' + this.iacData.quarter;
+    },
   },
   created() {
     if (this.isStudent) {
diff --git a/myuw_vue/mixins/utils.js b/myuw_vue/mixins/utils.js
index b6020723d..f74670ea0 100644
--- a/myuw_vue/mixins/utils.js
+++ b/myuw_vue/mixins/utils.js
@@ -131,8 +131,22 @@ export default {
       pageTitle[0] = term;
       return pageTitle.map((s) => this.capitalizeString(s)).join(' ');
     },
+
+    hasPassed(dateStr, useCompDate = true) {
+      if (!dateStr) return false;
+
+      dayjs.tz.setDefault("America/Los_Angeles");
+      const dt = dayjs(dateStr);
+
+      if (useCompDate && this.cardDisplayDates?.comparison_date) {
+        return dayjs(this.cardDisplayDates.comparison_date).isAfter(dt);
+      }
+
+      return dayjs().isAfter(dt);
+    },
+
     nowDatetime(useCompDate = true) {
-      if (useCompDate && this.cardDisplayDates && this.cardDisplayDates.comparison_date) {
+      if (useCompDate && this.cardDisplayDates?.comparison_date) {
         return dayjs(this.cardDisplayDates.comparison_date);
       }
       // dayjs.tz.setDefault("America/Los_Angeles");
diff --git a/myuw_vue/tests/mixins.test.js b/myuw_vue/tests/mixins.test.js
index a96085fcf..72e464ed2 100644
--- a/myuw_vue/tests/mixins.test.js
+++ b/myuw_vue/tests/mixins.test.js
@@ -140,6 +140,16 @@ describe('mixins', () => {
       .toEqual('in 4 days');
   });
 
+  it('hasPassed', async () => {
+    expect(utils.methods.hasPassed()).toEqual(false);
+    expect(utils.methods.hasPassed('')).toEqual(false);
+    const now = utils.methods.dayjs();
+    expect(utils.methods.hasPassed(now.subtract(1, 'd').toISOString(), false))
+      .toEqual(true);
+    expect(utils.methods.hasPassed(now.add(1, 'd').toISOString(), false))
+      .toEqual(false);
+  });
+
   it('formatPhoneNumberLink', () => {
     expect(utils.methods.formatPhoneNumberLink("+1 206 543-0000")).toEqual('+1-206-543-0000');
     expect(utils.methods.formatPhoneNumberLink("425-666-6666")).toEqual('+1-425-666-6666');
diff --git a/myuw_vue/tests/tuition.test.js b/myuw_vue/tests/tuition.test.js
index 7c2c27bbe..e83af7171 100644
--- a/myuw_vue/tests/tuition.test.js
+++ b/myuw_vue/tests/tuition.test.js
@@ -120,6 +120,7 @@ describe('Tuition store', () => {
     expect(wrapper.findAllComponents(CardStatus).length).toBe(5);
     expect(wrapper.vm.hasIacData).toBeTruthy;
     expect(wrapper.vm.dayOneAccessDueDateFromNow).toBeTruthy;
+    expect(wrapper.vm.dayOneAccessOverDue).toBe(false);
   });
 
   it('Evaluate the computed properties of jpce', async () => {