From 4fd877c909ce0cc8c3d844d9e8488b761c1e579e Mon Sep 17 00:00:00 2001
From: colts661 <yaw006@ucsd.edu>
Date: Mon, 22 Apr 2024 21:50:56 -0700
Subject: [PATCH 1/4] Added Bulk Daklapack Order Verification

---
 microsetta_admin/server.py                    | 24 +++++++++++++++---
 .../templates/submit_daklapack_order.html     | 25 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/microsetta_admin/server.py b/microsetta_admin/server.py
index d023e70..b5b59de 100644
--- a/microsetta_admin/server.py
+++ b/microsetta_admin/server.py
@@ -921,12 +921,27 @@ def return_error(msg):
                             f"not match expected column names"
                             f" {expected_headers}")
 
+    # disregard empty rows
+    addresses_df = addresses_df.dropna(how='all').copy()  
+
     # add (same) contact phone number to every address
     addresses_df['phone'] = phone_number
 
-    addresses_df = addresses_df.fillna("")
-    temp_dict = addresses_df.to_dict(orient='index')
-    addresses_list = [temp_dict[n] for n in range(len(temp_dict))]
+    # validate spreadsheet rows
+    empty_field_criteria = (
+        addresses_df
+        .drop(columns=['insertion', 'address2'])
+        .isna()
+        .any(axis=1)
+    )
+    hold_submission_addresses = (
+        addresses_df[empty_field_criteria]
+        .to_dict(orient='records')
+    )
+
+    # prepare addresses for submission
+    addresses_df = addresses_df[~empty_field_criteria].fillna("")
+    addresses_list = addresses_df.to_dict(orient='records')
 
     status, post_output = APIRequest.post(
         '/api/admin/daklapack_orders',
@@ -959,7 +974,8 @@ def return_error(msg):
                            **build_login_variables(),
                            error_message=error_message,
                            success_submissions=success_submissions,
-                           failure_submissions=failure_submissions)
+                           failure_submissions=failure_submissions,
+                           hold_submission_addresses=hold_submission_addresses)
 
 
 @app.route('/authrocket_callback')
diff --git a/microsetta_admin/templates/submit_daklapack_order.html b/microsetta_admin/templates/submit_daklapack_order.html
index 96e6280..95f0eae 100644
--- a/microsetta_admin/templates/submit_daklapack_order.html
+++ b/microsetta_admin/templates/submit_daklapack_order.html
@@ -144,7 +144,29 @@ <h3>Submit Daklapack Order</h3>
 {{ error_message }}
 {% endautoescape %}
 
-{% elif success_submissions or failure_submissions %}
+{% elif success_submissions or failure_submissions or hold_submission_addresses %}
+    {%  if hold_submission_addresses|length > 0 %}
+<p>
+The following addresses are incomplete and NOT submitted to Daklapack.
+Please fill in all fields except for `insertion` and `address2`, then re-submit.
+</p>
+<table border="1">
+    <thead>
+        <tr>
+            <th>Address</th>
+        </tr>
+    </thead>
+    <tbody>
+    {% for curr_address in hold_submission_addresses %}
+        <tr>
+            <td>{{ curr_address }}</td>
+        </tr>
+    {% endfor %}
+    </tbody>
+</table>
+<br>
+    {% endif %}
+
     {%  if failure_submissions|length > 0 %}
 <p>
 The following orders were NOT successfully submitted to Daklapack.
@@ -168,6 +190,7 @@ <h3>Submit Daklapack Order</h3>
     {% endfor %}
     </tbody>
 </table>
+<br>
     {% endif %}
 
     {%  if success_submissions|length > 0 %}

From 95a56c9757ef0d05f4ea8db604be89436020983b Mon Sep 17 00:00:00 2001
From: colts661 <yaw006@ucsd.edu>
Date: Mon, 22 Apr 2024 21:53:01 -0700
Subject: [PATCH 2/4] Fixed style

---
 microsetta_admin/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsetta_admin/server.py b/microsetta_admin/server.py
index b5b59de..2bd0999 100644
--- a/microsetta_admin/server.py
+++ b/microsetta_admin/server.py
@@ -922,7 +922,7 @@ def return_error(msg):
                             f" {expected_headers}")
 
     # disregard empty rows
-    addresses_df = addresses_df.dropna(how='all').copy()  
+    addresses_df = addresses_df.dropna(how='all').copy()
 
     # add (same) contact phone number to every address
     addresses_df['phone'] = phone_number

From 2949a2e8ccccd36a08cdc13066957cf0409d89ef Mon Sep 17 00:00:00 2001
From: colts661 <yaw006@ucsd.edu>
Date: Tue, 23 Apr 2024 20:59:40 -0700
Subject: [PATCH 3/4] Display missing fields

---
 microsetta_admin/server.py                    | 76 ++++++++++++-------
 .../templates/submit_daklapack_order.html     | 11 ++-
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/microsetta_admin/server.py b/microsetta_admin/server.py
index 2bd0999..76d783c 100644
--- a/microsetta_admin/server.py
+++ b/microsetta_admin/server.py
@@ -934,48 +934,66 @@ def return_error(msg):
         .isna()
         .any(axis=1)
     )
-    hold_submission_addresses = (
-        addresses_df[empty_field_criteria]
-        .to_dict(orient='records')
-    )
+
+    # display missing columns for incomplete addresses
+    hold_submissions_addresses = addresses_df[empty_field_criteria]
+    hold_submissions = pd.DataFrame({
+        'missing_columns': hold_submissions_addresses.apply(
+            lambda ser: ', '.join(
+                ser.index[ser.isna()]  # find null fields
+                .drop(['insertion', 'address2'], errors='ignore')
+            ),
+            axis=1
+        ),
+        'address_dict': hold_submissions_addresses.fillna("").apply(
+            lambda ser: ser.to_dict(),
+            axis=1
+        )
+    })
+    hold_submissions_list = hold_submissions.to_dict(orient='records')
 
     # prepare addresses for submission
     addresses_df = addresses_df[~empty_field_criteria].fillna("")
     addresses_list = addresses_df.to_dict(orient='records')
 
-    status, post_output = APIRequest.post(
-        '/api/admin/daklapack_orders',
-        json={
-            "project_ids": project_ids_list,
-            "article_code": dak_article_code,
-            "quantity": article_quantity,
-            "addresses": addresses_list,
-            "shipping_provider": shipping_provider,
-            "shipping_type": shipping_type,
-            "planned_send_date": planned_send_date,
-            "description": description,
-            "fedex_ref_1": fedex_ref_1,
-            "fedex_ref_2": fedex_ref_2,
-            "fedex_ref_3": fedex_ref_3
-        }
-    )
+    # skip API call if no valid address
+    if addresses_list:
+        status, post_output = APIRequest.post(
+            '/api/admin/daklapack_orders',
+            json={
+                "project_ids": project_ids_list,
+                "article_code": dak_article_code,
+                "quantity": article_quantity,
+                "addresses": addresses_list,
+                "shipping_provider": shipping_provider,
+                "shipping_type": shipping_type,
+                "planned_send_date": planned_send_date,
+                "description": description,
+                "fedex_ref_1": fedex_ref_1,
+                "fedex_ref_2": fedex_ref_2,
+                "fedex_ref_3": fedex_ref_3
+            }
+        )
 
-    # if the post failed, keep track of the error so it can be displayed
-    if status != 200:
-        error_message = post_output
+        # if the post failed, keep track of the error so it can be displayed
+        if status != 200:
+            error_message = post_output
+        else:
+            order_submissions = post_output["order_submissions"]
+            success_submissions = [x for x in order_submissions if
+                                   x["order_success"]]
+            failure_submissions = [x for x in order_submissions if not
+                                   x["order_success"]]
     else:
-        order_submissions = post_output["order_submissions"]
-        success_submissions = [x for x in order_submissions if
-                               x["order_success"]]
-        failure_submissions = [x for x in order_submissions if not
-                               x["order_success"]]
+        success_submissions = []
+        failure_submissions = []
 
     return render_template('submit_daklapack_order.html',
                            **build_login_variables(),
                            error_message=error_message,
                            success_submissions=success_submissions,
                            failure_submissions=failure_submissions,
-                           hold_submission_addresses=hold_submission_addresses)
+                           hold_submissions_list=hold_submissions_list)
 
 
 @app.route('/authrocket_callback')
diff --git a/microsetta_admin/templates/submit_daklapack_order.html b/microsetta_admin/templates/submit_daklapack_order.html
index 95f0eae..0fc5e61 100644
--- a/microsetta_admin/templates/submit_daklapack_order.html
+++ b/microsetta_admin/templates/submit_daklapack_order.html
@@ -144,22 +144,25 @@ <h3>Submit Daklapack Order</h3>
 {{ error_message }}
 {% endautoescape %}
 
-{% elif success_submissions or failure_submissions or hold_submission_addresses %}
-    {%  if hold_submission_addresses|length > 0 %}
+{% elif success_submissions or failure_submissions or hold_submissions_list %}
+    {%  if hold_submissions_list|length > 0 %}
 <p>
 The following addresses are incomplete and NOT submitted to Daklapack.
+The required fields missing are displayed below.
 Please fill in all fields except for `insertion` and `address2`, then re-submit.
 </p>
 <table border="1">
     <thead>
         <tr>
+            <th>Required Field(s) Missing</th>
             <th>Address</th>
         </tr>
     </thead>
     <tbody>
-    {% for curr_address in hold_submission_addresses %}
+    {% for hold_submission in hold_submissions_list %}
         <tr>
-            <td>{{ curr_address }}</td>
+            <td>{{ hold_submission['missing_columns'] }}</td>
+            <td>{{ hold_submission['address_dict'] }}</td>
         </tr>
     {% endfor %}
     </tbody>

From 7783434168a3a3031fde9a2446c0e5c96ad188ae Mon Sep 17 00:00:00 2001
From: colts661 <yaw006@ucsd.edu>
Date: Tue, 23 Apr 2024 20:59:56 -0700
Subject: [PATCH 4/4] Add tests

---
 .../tests/data/order_addresses_sample.xlsx    | Bin 8960 -> 9047 bytes
 .../data/order_addresses_sample_hold.xlsx     | Bin 0 -> 9075 bytes
 microsetta_admin/tests/test_routes.py         |  41 ++++++++++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 microsetta_admin/tests/data/order_addresses_sample_hold.xlsx

diff --git a/microsetta_admin/tests/data/order_addresses_sample.xlsx b/microsetta_admin/tests/data/order_addresses_sample.xlsx
index 005ac0a9eb4a559d75501e5b272bc83badb97430..902ecdcf81169227e67ce7773e7ed6632101865d 100644
GIT binary patch
delta 5392
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

delta 5388
zcmZ8lWmFX0)*d>C7Eo&F9!k1fkQ}5N20<Ez5`iHENf8DFr3C@$?g8oU?k+)wkQTVU
z?{~lZu6xf~XPvXo-apQI)_(Th&z@BYR;jqdh3}vj#9Lzk0M@tw05Jdn@N?$#b@Ozx
zadUG5`?)xm=$pIcN{|G$P23Sj`bH0n7VbM<Pn1rT6^Sg$l+p5c<6D&pXcjp>+|nUF
z)GSWx*EQ?f*p9jfyxfU}-M?BCSs;IevAL|!YyWK4!SFcIJD%X~Ku{FjoQ7pzed72%
z9Q?~(VlNAPe}53r+3nwbZGsW(YP46I6bSvSs5|+Q(7vUB&WH<a!eq@!Kb%9Al%%Nn
z&6#FWp-;%PLn81UNt7PHpMGU%ehanfLO)$(HZVaBUT7>k<ly3gZ}z;)|1d7JURtii
zsB`NKv&hMX)Lh2L?1MgrwOeJe3s!(M{K^_LOgIZO-&eJ^gd|`sSqj4erg~%koB9)V
zn_BxtAd!}$r-po1YSDT~^07?cfTY!HRsPr@8emurTdC5A7UD0BIIbUqJS-|BR#17x
z39SzbCi>r0W}gW5l|U0e5-h)CT^$ppu{qpK5Vq>(=&EzIpxp{!u1Pe2I&YD^g-dmY
z<?e=mES8d|&Z1FMR%OxjW0!w-+Yn?3Blm&8bQ*k~KhS;39y7}3i+rR4QGyCDkr+GW
zI#4!Udk3#+P81!P35+X@&g2Q}NtCdnh7HkKQO)aAEb91=>hVHQeLpkd8tCp6<2;=-
zoKO8)HOjLoe7ErMF}C?G1K;3%f)lqQ=jPNs(#0df5nZ@2c9D)T?YO6dkfi)pRQQ#o
z5@So@8Z_y=bq*hvBYC8)F$<M6<&Rb|pdW?H-^S<cFhtB>m@5~R)xJ>??bM}o{N}=7
zWOxdUY*!{3KC|BUt60+L!7&(kA{DyUa7k<zFU;S=;r@ag_ql-S9v|fh+=lO&XD5;K
z;xSLJC^|v73hh=!RzzkNCOPxjqp$nuSdNn=-iSTa)Ys_se1qx%uvE;m3`X#CDSfw~
zQjjJZli}nRwG}jcAk1}p8dUK3S9dVI&zL<!`1=sSMd5T%P3-qdUS<ynH|&mQ*v4>L
z^$tx5zVRd-N<aL-6K$sne`|&hDUn~SuZivls4rk)23R8EmO&~aI$oaXG(<!Rq`jH8
z4X<3AWwa1O!|_o4t7#m*obTx?`AYA{vWr9uyz_bj+TP5S_|V)+AYV1@iRiyxZM%cN
z_azBb)b<)dX?tn3n(>uu|3VIYT%|u%dnOw<lU|h5qo%lH)*17F20$cWP{5CIjedPa
z2LK@0008j+SP1ia?Q948i-URkE>4U5B=<6NaFUy&0iR7Cyt=`ODV@EZY`Vi@o583;
zi&z%>k)HcoEguV7iMsKiD6QQ|*yu70GLfc*Ut`<jSt>|t9!@Qw|0B9sGonrAQ9B{?
zL19thShStrC{JrYe6{U)=_0{JgWV8gu#QNl>F#GN#=0dzwV%nZsiAzeB8d`npMjNe
z)-_f4A1GLeIyn=PxTQcm&}&&x;^*BuJat~0A6K6VjxMArRjSOE+>%7Rc!M3OG##Rv
z92{+?KG`O&+%m;)eH}NLJ;Ha7Ds!@^O7Yr-YB{`CLEoBXge&9WZN@A}o~h^I2{`v6
z1H`nQO4F6Ux+Y@?gcQ29Zy4{RijK2dV37lQw-`SQ0ot)@nIBCY!f2o2WW=<n>h?!O
znsQw&xT8wGZP~~++`^Cx@5K6ZE@h(q=-+jBFoL_H^bhfZnYHC*dSkh)!iX*=TSI=~
zv$+KCZ{Cw4;R0R^-Tixjee#`slQev`+okwiZf&e$IuhZ4>ht1B;P0|pSawjRLAq<r
zmyQ&{;B-Qc0;q!2&HjUdrIoKRq?9MGxm=L&vQKo~L4gqm_MJwA9v&-V)%KXu`<zt<
z^xnbpgUnY|3lt&zVpjkA7A<J3X}iPY9H%4L*n5`}{?-C*x7=biU5|24soQY@|I+Iw
zb-ns7O1~xfg!2c%>Z@5r=#{gq-`6kSM%yJWt*l$DluOqi-@mT^&2PE<$b+9CrP|7K
zIMFJT$539d(Y(x{TPn75(J~ij4LI8dFF&OK&vfAXu?*$RDMrQHTSlm+g#^jw%Dov1
zq}T3@msg{}?)Ij}LU3kaRquO~QK(Ur=OebwAuP;C{oGkmAC$(A*ZfZVJ3RU^4OL6u
z<HsREWX=x|OmQyx5jgg>+uu=)*G@&!s)Yjp^dOFawD92=8c~WisvB8CnD1}l&3M+8
zwNYopG7B^#iMF=xP}e|6FtLS(9GzAC9Kw<JHATTqI%z@<1Bm<;kH=E8&oItDJjYzR
z&64J<ZsG%sQN2eN6kKKo`JZ{6OdwPJRZ|H%5<gnD>YPfa$Ihj)On!triE%s)(0-N_
zOKOMb3cn`c`Tcw`E69`7r60F<4&z$MIp-sTn)o6YWjAg_Lc{l$Vj-(+vAxean6oH*
zY3agNQYpE=LQ1Kb6R#{nZFJrQ3NkVu0+ZF@Z@#r?uL~q70Ao2;4T~ySb1FAGs}v%`
z_aH}fj0>mMnF5mZ8*e5qImpO@9IjdKcB$(5DB<G<Y)aeM#)_`l4}y&vRslxiu+#l^
z#|aQ_n8};3mKcR*z2^saCT(>S1!xXWLzDCC<|Gc1T|Za@b#A6}nhjC<gOn>{mgd!s
zbVc#uv)M1;6%h=CO>4>o<?@^|W}WXcUKZFN%w|(qns&}U|7oF9|I0~7NzJn%0vulJ
z=nHRLcm(a(dr!VX7$%QQ<Q&!g04zR)=xG=+iEf+39tp|-g3%!?Y8(CCgxX`cRShv5
z;%i-ttdqE8ZV_Z`Rt+yWf$I8K<uW1n`OMLE{DOJO=2lTgG>{8Fo34J1y5HQ{)1n~0
zOzAiG$NOjR+N9yX_O3fEs~T&$p1b0(>cRDnrsFLi?(V2oEZgpnf1HT!PqCkLbhZ7y
z9!zO_IFUH7*jReR*BW?wx{sh*4Lsk~j;C8#q@_zeW{j#lE?c)nvBg-25Z#`j$!2u%
zD|98wk?#2v9u4-PTbP1=ba+?%>{z5V>cMJ}YIB-zVmN7JdH<<gr4nn&Hr9vQR|39P
z^m*|3*gaEY8FAJa)f_dJ;B*95F9BTc3S}E^K<48r>~?_BWKsEI?Gt)!m5Q-+#m$P5
z+q2Sw8yXc+zm7=C!y+eH6+Nw3A>bNCo5;ZqJJ8#O)8Q4D^3Fo1Y3Tqcv-O{k@CQYH
z+wK{30P7w?#FYeu=~`o;TY{c&c)KcF86S(1e>CUWjV;gH=Q|Sb&Y#G);S+8W-O`(P
zi6lPv+?!~Op%zMz_L+;*k%BE~B=&U$u@NyUC-{b`Q3b@$ODah#(&|(REY;)Hb=<vV
zYQWlZ{G7xdd1E(1SJ@K#3CTd^6<QHvw;)wFS34XfBq?$BEqS4tTF)!C2TuK_UIu0~
zW-T<h+c<8>WR*;Js9wU|H==)@ZiQx-SmZRr>6wDdZFhN+<Wgbp<`L>g$q_}mns@y~
zX<6M|Y&-phf5v+v%{5{4ZHBFwNzPfUJ^sYzHnoE|Tx0tbf6Ai(b9e3_x9VOi%N6OL
zt(cDk93O)&>Mw>#be%$_tl<&3_=Hr;p^=a7&6F~VO`MOC(&o}ch%qQs43OlAt+?*d
zs4Di~z612WXfSN7c+->HB#AT*yIrM_YP?GZ9w&c?%%$({i6yX^*ZMGv>8pp^qL-5v
zGUaw7PM^+9dd@G-<sCn@1cVH*p-%TQwOcB;g&32L2C=%E6?_9RTj1ldIQ)f+x=rkj
zj%XuHSD%Gbd6trxc{e@SWZ4B5;>QS06z!J3r$=j?zwi@c%eKvX=gs{nYpnEE>&!1c
zZc@v>v83tqHv+80Yd=o2IK>q8{5=zC)Jo~pLD1d{U*i;Pj`>MyYmJvQy57{fmP85^
z7WQu~=06#Ydl`-E{769%l1rf@l@aRXOnk(oPRdN|4Iyl7dShLZuGh7Wxb<AjPo1vG
z_ozE({jeLEr%b87=r#B}R?Bp~@<pVPGYiU?Y<`yGW=QiO@sjNG6KrRG6|qdMo2kVR
zvaVO=eqYqRN>{=%PuqcHh>J&JNbHJ|B96(a&^8db6r6CR_Od9$^Z*R|)sB6BH`k9T
zFU0;k$t_^<sp3=>*H_m&End$uCvYPX+4O7mmi4K?7>ss)-mD=(P2(1=&gklD-NhOq
z9$Z50DUmA|Zxu1=lQMSMzKkIgZ#kX=^^B{Vfu)w|mpHy5QvU96u>#1Rj)GeXGsn#Y
zO<$6TRSbLyVH}6M+9J-*`w+zGjI*ph$D8!Tx{c&T7$k?Zt~lI>+F<am!t94P7x9`^
zg030S<iQP^ne~{m&#Us@S@6;3Ht%paX-tfU<q%cv`prhG*?fQpiWHP_TRV_#?Be4X
z{<2n@0~4v0J9aoD5pGdxiURsCSB%q29V3~6M7#^rt~v*z__dz(rnru*c0swug*eIT
zl7;m&ciDF!Zd<Eu&Om4@;L@?V?g8zu4h;Y5(2J)2PX|_kgD|FMfG3;BZ-6KwP@?k>
zat*UV4%43(`ePY#+0vXZ&Yp1U3%cy1|41Fazm#^FHAzMCBOK7Bj_F4RLsW>%Uq@(Z
zaDk&AU)+FIO0t>OyMrRy;HKwn)SQ~pZ=qkTgaWMbWxE(;mFyWUr$Pkc<Z^U`0>+xs
zCEkC*`A9xZ#mXI=2UplpQZziG(^pqX^w-T4Z#{UQo_>rjim&%NKH{04*1W=)?FjyI
z<g<^Yz*|Eci=tu^EmXo_RDk$LX|7W;79Xk28%T^z(&YY2OI$Ud$6I$lfOyK~WI-~&
zac23?uhO207eF`?e#mf04ri|BGf3npIu!pBd1!{V<S@@i8NzY=5T~p4tb7i&ztiT{
zGHh}UN~)e~#Y=r!Uu~bG!)|BV!y25fqKZ(g7d`p2so!)?bGV!P3SNh8a;&>|=o>t%
z@`_+U?)wC1h!q{|;@I0yzhc((u{7=}d`Z&TS;#e-LBcoP1te_DF8qO)%#`yvYcAbx
zp3tor|3SYu7|w?2zJR-YA-qro-Ww(R8EFGcxZ8@7k$cu4hWET*VA8Vd_3+hwwzU^#
zlwq=vCYT_fBZ<fPE2{oAPb8ZMOZVgU{mwdlwW8)NO>X2vSuC^3aNyhi?606wy+f4|
zybJY*$^!72h6qY<6&eGkNp+sLQ$&<D@$k>XQsOk~;73)J{UYWf0`ql)9UsN5Y!6tI
zP<Iv`TQko`MJ9vm(y(iOKF!|V9VpiZ{|b~`tF9cX@^_INJcvW%t**yzX>@78zWfz5
zYjrv-d=QyQ=qH)m<g;tOXBxx@bht(eW^Z3sqw%)QV%Nk8W!s6jNYqQ+r4`3{4BL*I
zZ6+Sh3$rs_w&-x!z6zY~rS9M1b-x{(`BFk3>=8V!<-mLDgaTNqU|%l$RBU*G8~F1D
zG32&1?g9O8Dbc#@jg&$I05JcEdWwHb2?uLWJE)$Q=POtHzZHdZ;<y&N0EzOd=I?j;
zsEP_Q`ReAkax4jj!~_gF^%zg*wPr_323Ad{s3%Y7V5p@L7n31b7w(mIgon|<i8~9H
z)n-k*BB$@-yLJtHn{bm_qMRglka&4nIX;|;(wg#HlIqTp%wVB-sQyzgIxC%v5!3GV
zJ>tjS^hx>5fJKo()!fA)t}w{cGF7mhO!61ivzg9Q;ulz-iq;(6q)w`<bf9LB<{#hV
zmNpF~&(KHqRIY+TcE^M$gK$n$eZf!NQnc6&MI*E;CH=&OGY_u1Zp|07z{;{*8W1xB
zu>9t46{&D`3gO-u9tldd6q6jI$6^h0NV6`eA$wuLT#dJgeD6wY4}TkZ?YO)3Ffbsp
z_Vfuq-fBrfSU;4~zVs27*E)iQE;L(T!}3G2sM`8YmH<Ip!_D6S<2^oXrc(I>Fs%9w
z4G0Y$n`o)s38Lu!gC!9V#ap9S{h=;q^01$kZNwpf*}a~WfHm0X_F_V|Sa>lk-hJfG
z;|TA1BfDsirUX$7*7;0A5wcVJ!QU`@c9<(Ox9@d6R<R=xOCnS;=JbYZH{x`mqq-Dm
z#MiDIl1I0lFZTuo?4CQ3=GaMG8<Ss}F@Os&y!Uwr+{|*u5o6vW;y%{kA9W{)9e$>S
z0XZgp)#^NrhS{qVg8q|E3qkSVFKx69Ch{8S`j#jAxnh#UcYv~mO7*h6e|+w#=EP7F
zH6uKFbyk~ixu|l=#gJC#6M<GE){c|uN^xDA17|6I?a`-!6D60llGL*Uog0HtBYFis
zV0u~y!Lq`g5a<g@!UaJ_QvH1A=F9MbSSX8@n#N8VPj0oTdR4qgXV$fdCp;&D<$-<V
zm5&f(Ccy6fXsg;a#$REJ*I{9d`{56&G}XBDjA(F8w?%%!2o%N*1K~1_xQi}fNQuoe
z!(SCPXo)`dTKTp)RV<Mu35T=Vb>ma>J_~USd=@fa3Xg~~xcxPtVdY((y3y!JyxQ|y
zbtx1*ST-h<IsgdvE9oLtTiTD&c0?$2by0rnqs-(Q7wk<=f|?u#Q#SsD72tit7<siY
zI0k<@vlhtjM(6+0(C#(&$@e{{628rT9gX+JnGdryL@(EJQ<eo@T9vkT?UkU7luv2T
z<jLi%Z{WqA(-!i!(i2Ls?g}Q0*E_5vZs&rN(+eD(zOPHfj{(ILSY`2lkXjq9VmmXH
z`dgekh~<SImbZN8*8PpyfmT8$%|ehVv<8BwB?|Z?i0v~lA|Ww-c~DA?Zh>^C-Ad&6
zpzen-*t!*e$X1W|#z>Xo&5ASVL^d)7wvk}Hk>Os4vHBD?A}S-Uebf1dt_k-(m8M`X
z?Y#UKt?xQL_3G?vix-QOWHZ+|S_d+ZrfgTBo?-n>SZ%#G=4ZaPVqq!!Gv}v1x)uZ}
z*OvCetg>Y$57>xi&>a3hV?sm*qY&-?&MW@pnSZZ9LWCO=1MPpLAP4{;|9{)xrzSB1
z%*0CjPrU^IsQ=4hh!SB={RGj)L_+(&x$Gam#>a?5MmC!NaPd#&CjH0y=f;jeF|pA6
XC#wD=Lz4fp=OMt%%-D{gzaIYuat#lX

diff --git a/microsetta_admin/tests/data/order_addresses_sample_hold.xlsx b/microsetta_admin/tests/data/order_addresses_sample_hold.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..23db5d0ec2080e033b4587a906f07db4619b87d5
GIT binary patch
literal 9075
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
T{B!{TO!y}N?$a0Pet!EutIW2~

literal 0
HcmV?d00001

diff --git a/microsetta_admin/tests/test_routes.py b/microsetta_admin/tests/test_routes.py
index 43fed19..6ad3ed4 100644
--- a/microsetta_admin/tests/test_routes.py
+++ b/microsetta_admin/tests/test_routes.py
@@ -474,8 +474,7 @@ def test_post_submit_daklapack_order_success(self):
         # server side issues one POST to the API
         api_post_1 = DummyResponse(
             200,
-            {'order_submissions':
-                [
+            {'order_submissions': [
                     {'order_id': '11211',
                      'order_address': {'address1': '123 Main St',
                                        'address2': '',
@@ -505,16 +504,52 @@ def test_post_submit_daklapack_order_success(self):
                                        'phone': '(858) 555-1212',
                                        'postalCode': 'KG7-448',
                                        'state': 'Ontario'},
-                     'order_success': False}]}
+                     'order_success': False},
+                    {'order_id': '11213',
+                     'order_address': {'address1': '38 Diagonal St',
+                                       'address2': '',
+                                       'city': 'Chiba',
+                                       'companyName': 'Dan H',
+                                       'country': 'Japan',
+                                       'countryCode': 'jp',
+                                       'firstName': 'Jerry',
+                                       'insertion': '',
+                                       'lastName': 'Index',
+                                       'phone': '(858) 555-1212',
+                                       'postalCode': '261-0022',
+                                       'state': 'Chiba'},
+                     'order_success': True},
+            ]}
         )
         self.mock_post.side_effect = [api_post_1]
 
         response = self._test_post_submit_daklapack_order()
+        self.assertNotIn(b'The following addresses are incomplete and NOT '
+                         b'submitted to Daklapack.', response.data)
         self.assertIn(b'The following orders were NOT successfully submitted '
                       b'to Daklapack.', response.data)
         self.assertIn(b'The following orders were successfully submitted '
                       b'to Daklapack', response.data)
 
+        # File: 3 complete addresses, 2 empty rows
+        # Expected: 3 addresses returned from Daklapack API + 2 table headers
+        self.assertEqual(response.data.count(b'<tr>'), 5)
+
+    def test_post_submit_daklapack_order_hold(self):
+        # No Private API Call
+        response = self._test_post_submit_daklapack_order(
+            "order_addresses_sample_hold.xlsx")
+        self.assertIn(b'The following addresses are incomplete and NOT '
+                      b'submitted to Daklapack.', response.data)
+        self.assertNotIn(b'The following orders were NOT successfully '
+                         b'submitted to Daklapack.', response.data)
+        self.assertNotIn(b'The following orders were successfully submitted '
+                         b'to Daklapack', response.data)
+
+        # File: 4 complete addresses, 3 empty rows
+        # Expected: No API Call, 4 hold addresses + 1 table header
+        self.assertEqual(response.data.count(b'<tr>'), 5)
+
     def test_post_submit_daklapack_order_fail_api(self):
         # server side issues one POST to the API
         api_post_1 = DummyResponse(400, {