Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Dummy shipping methods can now be defined and used on the order_admin…

… while shipping calculation is enabled.
  • Loading branch information...
commit e82d0f48b83a5865cb99adf37ee0ccb2a3523401 1 parent aa2dfb8
Adrian Oldham authored May 31, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  templates/admin/order_detail.tmpl
4  templates/admin/order_detail.tmpl
@@ -374,18 +374,17 @@
374 374
   </form>
375 375
   <:- .end if:>
376 376
   <form action="<:adminurl shopadmin:>" method="post" data-object="Order">
  377
+    <:-if Eq [order shipping_name] "none":><:or Eq:>
377 378
     <fieldset>
378 379
       <legend>Freight</legend>
379 380
       <input type="hidden" name="id" value="<:order id:>" />
380 381
       <:csrfp shop_order_save hidden:>
381  
-      <:- if Cfgsection "dummy shipping methods":>
382 382
       <div>
383 383
         <label for="shipping_name">Shipping method</label>
384 384
         <span>
385 385
           <:shipping_method_select:>
386 386
         </span>
387 387
       </div>
388  
-      <:- or Cfgsection:><:eif Cfgsection:>
389 388
       <div>
390 389
         <label for="freight_tracking">Tracking code</label>
391 390
         <span>
@@ -393,6 +392,7 @@
393 392
         </span>
394 393
       </div>
395 394
     </fieldset>
  395
+    <:-eif Eq:>
396 396
     <fieldset>
397 397
       <legend>Status</legend>
398 398
       <input type="hidden" name="id" value="<:order id:>" />

0 notes on commit e82d0f4

Please sign in to comment.
Something went wrong with that request. Please try again.