Page MenuHomeIn-Portal Phabricator
Files F847475

modern-store
No OneTemporary
Actions

File Metadata

Created
Fri, Apr 18, 6:00 PM

modern-store
View Options

Index: branches/1.0.x/receipt.tpl
===================================================================
--- branches/1.0.x/receipt.tpl (revision 14828)
+++ branches/1.0.x/receipt.tpl (revision 14829)
@@ -1,139 +1,188 @@
<!--##
<NAME>Receipt</NAME>
<DESC></DESC>
<SECTION>Pages||Checkout</SECTION>
##-->
<inp2:m_DefineElement name="page_title">Your Receipt</inp2:m_DefineElement>
-<inp2:m_DefineElement name="add_to_head">
+<inp2:m_DefineElement name="order_field_element" title="lu_fld_{$field}">
+ <inp2:m_if check="{$prefix}_Field" name="$field">
+ <dt class="label-title"><inp2:m_Phrase name="$title"/>:</dt>
+ <dd><inp2:$prefix_Field field="$field"/></dd>
+ </inp2:m_if>
+</inp2:m_DefineElement>
+<inp2:m_DefineElement name="orderitem_elem">
+ <tr>
+ <td class="item-img">
+ <inp2:p_Image render_as="image_element" Primary="1" MaxWidth="58" DefaultWidth="58" DefaultImage="img/no_picture.gif"/>
+ </td>
+ <td class="item-title">
+ <inp2:Field name="ProductName"/><inp2:m_if check="ord_BackorderFlag"> <span><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
+
+ <inp2:m_if check="HasDiscount">
+ <br />
+ <inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
+ <inp2:m_Phrase label="lu_comm_Discount" />: <span><inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
+ </inp2:m_if>
+ </td>
+ <td><inp2:Field name="Quantity"/></td>
+ <td><inp2:Field name="Price" currency="selected"/></td>
+ <td><inp2:Field name="ExtendedPrice" currency="selected"/></td>
+ </tr>
</inp2:m_DefineElement>
-<!--## MAIN CONTENT ##-->
-<inp2:m_DefineElement name="content">
+<inp2:m_DefineElement name="order_form_shipping">
+ <fieldset>
+ <div class="fieldset">
+ <label>Shipping Information</label>
+ </div>
+ <dl class="info">
+ <dt class="label-title">Shipping Type & Cost:</dt>
+ <dd>
+ <inp2:ord_ShippingType /> <inp2:ord_Field name="ShippingCost" currency="selected"/>
+ </dd>
+
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="ShippingTo" title="lu_fld_FullName"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="ShippingEmail" title="lu_fld_Email"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="ShippingCompany" title="lu_fld_Company"/>
+
+ <dt class="label-title">Address:</dt>
+ <dd>
+ <inp2:m_if check="Field" field="ShippingAddress1">
+ <inp2:Field field="ShippingAddress1"/><br/>
+ </inp2:m_if>
+
+ <inp2:m_if check="Field" field="ShippingAddress2">
+ <inp2:Field field="ShippingAddress2"/><br/>
+ </inp2:m_if>
+ <inp2:PrintLocation type="Shipping"/>
+ </dd>
+
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="ShippingPhone" title="lu_fld_Phone"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="ShippingFax" title="lu_fld_Fax"/>
+ </dl>
+ </fieldset>
+</inp2:m_DefineElement>
- <ul class="steps">
- <li class="step1"><span><i></i>Shopping Cart</span></li>
- <li class="step2"><span><i></i>One-step Checkout</span></li>
- <li class="step3 active"><span><i></i>Receipt</span></li>
- </ul>
+<inp2:m_DefineElement name="order_form_billing">
+ <fieldset>
+ <div class="fieldset">
+ Billing Information
+ </div>
+ <dl class="info">
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="BillingTo" title="lu_fld_FullName"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="BillingEmail" title="lu_fld_Email"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="BillingCompany" title="lu_fld_Company"/>
+
+ <dt class="label-title">Address:</dt>
+ <dd>
+ <inp2:m_if check="Field" field="BillingAddress1">
+ <inp2:Field field="BillingAddress1"/><br/>
+ </inp2:m_if>
+
+ <inp2:m_if check="Field" field="BillingAddress2">
+ <inp2:Field field="BillingAddress2"/><br>
+ </inp2:m_if>
+
+ <inp2:PrintLocation type="Billing"/>
+ </dd>
+
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="BillingPhone" title="lu_fld_Phone"/>
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="BillingFax" title="lu_fld_Fax"/>
+ </dl>
+ </fieldset>
+ <fieldset class="creditcard">
+ <div class="fieldset">
+ Payment Information
+ </div>
- <div class="clear"></div>
+ <inp2:m_if check="UsingCreditCard">
+ <p>
+ <inp2:Field name="PaymentCardType"/> <inp2:Field name="PaymentAccount" masked="masked"/>
+ </p>
+
+ <dl class="info">
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="PaymentCCExpDate" title="lu_fld_ExpirationDate"/>
+ </dl>
+ <inp2:m_else/>
+ <dl class="info">
+ <inp2:m_RenderElement name="order_field_element" prefix="$PrefixSpecial" field="PaymentType"/>
+ </dl>
+ </inp2:m_if>
+ </fieldset>
+</inp2:m_DefineElement>
+<inp2:m_DefineElement name="order_form">
<div class="cart-detail receipt">
- <div class="success-order">
- <p class="links">
- <a href="javascript:window.print();" class="link-print">Print</a>
- <a href="" class="link-download">Download</a>
- </p>
+ <div class="success-order">
+ <p class="links">
+ <a href="javascript:window.print();" class="link-print">Print</a>
+ <a href="" class="link-download">Download</a>
+ </p>
- <div class="clear"></div>
- <p class="green">Thank you for your order #<inp2:ord_Field field="OrderNumber"/>!</p>
+ <div class="clear"></div>
+ <p class="green">Thank you for your order #<inp2:ord.last_Field field="OrderNumber"/>!</p>
- <p><strong>Below is the receipt / confirmation for your order. Please <a href="">print</a> or <a href="">download</a> it for your records.</strong></p>
- <p>You will receive a confirmation once the order is approved and/or shipped.<br />Your credit card was authorized for the amount of your order but will not be charged until the order is approved</p>
- </div>
- <h1>Order <inp2:ord_Field field="OrderNumber"/></h1>
+ <p><strong>Below is the receipt / confirmation for your order. Please <a href="">print</a> or <a href="">download</a> it for your records.</strong></p>
+ <p>You will receive a confirmation once the order is approved and/or shipped.<br />Your credit card was authorized for the amount of your order but will not be charged until the order is approved</p>
+ </div>
+ <h1>Order <inp2:ord_Field field="OrderNumber"/></h1>
+
+
+ <inp2:m_if check="OrderHasTangibleItems">
<div class="halfcol">
- <fieldset>
- <div class="fieldset">
- Billing Information
- </div>
- <dl class="info">
- <dt class="label-title">Full Name:</dt>
- <dd>Bill Smith</dd>
- <dt class="label-title">Company:</dt>
- <dd>Intechnic</dd>
- <dt class="label-title">Address:</dt>
- <dd>333 East Highway 83, Suite 201, Mundelein, IL, 60060</dd>
- <dt class="label-title">Phone:</dt>
- <dd>847-970-6190</dd>
- </dl>
- </fieldset>
- <fieldset class="creditcard">
- <div class="fieldset">
- Payment Information
- </div>
- <p>Visa XXXX XXXX XXXX 1234</p>
- </fieldset>
+ <inp2:m_RenderElement name="order_form_billing" PrefixSpecial="$PrefixSpecial"/>
</div>
<div class="halfcol halfcol-last">
- <fieldset>
- <div class="fieldset">
- <label>Shipping Information</label>
- </div>
- <dl class="info">
- <dt class="label-title">Shipping Type & Cost:</dt>
- <dd>FedEx Ground (Next Day) $14.00</dd>
- <dt class="label-title">Full Name:</dt>
- <dd>Bill Smith</dd>
- <dt class="label-title">Company:</dt>
- <dd>Intechnic</dd>
- <dt class="label-title">Address:</dt>
- <dd>333 East Highway 83, Suite 201, Mundelein, IL, 60060</dd>
- </dl>
- </fieldset>
+ <inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="$PrefixSpecial"/>
</div>
- <div class="clear"></div>
+ <inp2:m_else/>
+ <div>
+ <inp2:m_RenderElement name="order_form_billing" PrefixSpecial="$PrefixSpecial"/>
+ </div>
+ </inp2:m_if>
- <table class="items">
- <thead>
- <tr>
- <th colspan="2" style="text-align: left;">Items in your order (<inp2:ord_ItemsInCart/>)</th>
- <th>Qty.</th>
- <th>Price</th>
- <th>Total</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
- <td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
- <td>1</td>
- <td>$75.00</td>
- <td>$75.00</td>
- </tr>
- <tr>
- <td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
- <td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
- <td>1</td>
- <td>$75.00</td>
- <td>$75.00</td>
- </tr>
- <tr>
- <td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
- <td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
- <td>1</td>
- <td>$75.00</td>
- <td>$75.00</td>
- </tr>
- <tr>
- <td class="item-img"><img src="<inp2:m_TemplatesBase/>img/samples/good5.jpg" width="58" height="58" alt="" /></td>
- <td class="item-title">Nikon D5000 Kit 15-18 Digital Camera</td>
- <td>1</td>
- <td>$75.00</td>
- <td>$75.00</td>
- </tr>
- </tbody>
- </table>
-
- <dl class="total">
- <dt>Subtotal</dt>
- <dd>$1,759.99</dd>
- <dt>Shipping</dt>
- <dd class="price3">$100.00</dd>
- <dt>Tax</dt>
- <dd class="price3">$100.00</dd>
- <dt>Order Total</dt>
- <dd class="price4">$1,959.99</dd>
- </dl>
- <div class="clear"></div>
- </div>
+ <div class="clear"></div>
+
+ <table class="items">
+ <thead>
+ <tr>
+ <th colspan="2" style="text-align: left;">Items in your order (<inp2:ord_ItemsInCart/>)</th>
+ <th>Qty.</th>
+ <th>Price</th>
+ <th>Total</th>
+ </tr>
+ </thead>
+
+ <tbody>
+ <inp2:ListOrderItems render_as="orderitem_elem"/>
+ </tbody>
+ </table>
+
+ <dl class="total">
+ <inp2:m_include template="elements/ajax/order_totals" prefix="ord.last"/>
+ </dl>
+ <div class="clear"></div>
+ </div>
+</inp2:m_DefineElement>
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+
+ <ul class="steps">
+ <li class="step1"><span><i></i>Shopping Cart</span></li>
+ <li class="step2"><span><i></i>One-step Checkout</span></li>
+ <li class="step3 active"><span><i></i>Receipt</span></li>
+ </ul>
+
+ <div class="clear"></div>
+ <inp2:ord.last_ShowOrder render_as="order_form" />
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
<inp2:m_include template="designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/ajax/order_totals.tpl
===================================================================
--- branches/1.0.x/elements/ajax/order_totals.tpl (revision 14828)
+++ branches/1.0.x/elements/ajax/order_totals.tpl (revision 14829)
@@ -1,35 +1,42 @@
+<inp2:m_DefaultParam prefix="ord"/>
+
<inp2:m_DefineElement name="sub_total">
<dt>Subtotal</dt>
- <dd><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></dd>
+ <dd><inp2:Field name="AmountWithoutVAT" currency="selected"/></dd>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shipping_total">
<!--##<dt>Shipping</dt>
- <dd class="price3"><inp2:ord_Field name="ShippingCost" currency="selected"/></dd>
+ <dd class="price3"><inp2:Field name="ShippingCost" currency="selected"/></dd>
<dt>Insurance Fee</dt>
- <dd class="price3"><inp2:ord_Field name="InsuranceFee" currency="selected"/></dd>##-->
+ <dd class="price3"><inp2:Field name="InsuranceFee" currency="selected"/></dd>##-->
<dt>Shipping</dt>
- <dd class="price3"><inp2:ord_Field name="ShippingSubTotal" currency="selected"/></dd>
+ <dd class="price3"><inp2:Field name="ShippingSubTotal" currency="selected"/></dd>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="processing_total">
<dt>Processing Fee</dt>
- <dd class="price3"><inp2:ord_Field name="ProcessingFee" currency="selected"/></dd>
+ <dd class="price3"><inp2:Field name="ProcessingFee" currency="selected"/></dd>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="vat_total">
- <dt>Tax <inp2:ord_Field name="VATPercent"/>%</dt>
- <dd class="price3"><inp2:ord_Field name="VAT" currency="selected"/></dd>
+ <dt>Tax <inp2:Field name="VATPercent"/>%</dt>
+ <dd class="price3"><inp2:Field name="VAT" currency="selected"/></dd>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="discount_total">
<dt class="discount">Discount:</dt>
- <dd class="price2">- <inp2:ord_Field name="DiscountTotal" currency="selected" /></dd>
+ <dd class="price2">- <inp2:Field name="DiscountTotal" currency="selected" /></dd>
</inp2:m_DefineElement>
-<inp2:ord_PrintTotals sub_total_render_as="sub_total" discount_render_as="discount_total" shipping_render_as="shipping_total" processing_render_as="processing_total" vat_render_as="vat_total"/>
+<inp2:$prefix_PrintTotals sub_total_render_as="sub_total" discount_render_as="discount_total" shipping_render_as="shipping_total" processing_render_as="processing_total" vat_render_as="vat_total"/>
+
+<inp2:m_if check="ord_Field" name="GiftCertificateId">
+ <dt>Gift Certificate</dt>
+ <dd class="price3"><inp2:Field name="GiftCertificateDiscount" currency="selected"/></dd>
+</inp2:m_if>
<dt>Order Total</dt>
-<dd class="price4"><inp2:ord_Field name="TotalAmount" currency="selected"/></dd>
\ No newline at end of file
+<dd class="price4"><inp2:$prefix_Field name="TotalAmount" currency="selected"/></dd>
\ No newline at end of file

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server