Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #1

Merged
merged 52 commits into from
Jul 13, 2018
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
fe9ed47
Merge pull request #11 from HotcakesCommerce/development
Jun 15, 2017
b0d608f
Merge pull request #15 from HotcakesCommerce/development
Jun 20, 2017
1fd1105
Update to resolve Issue #16
WillStrohl Jun 21, 2017
9f757d6
ignoring more build and environmental artifacts
WillStrohl Jun 21, 2017
ff4c5c5
minor connection string update just to have a baseline for the next u…
WillStrohl Jun 21, 2017
f81f159
Updates to remove the SKU from the UI; and to allow the HCC elements …
WillStrohl Jun 26, 2017
ad53be8
Merge pull request #23 from hismightiness/Issues/Issue-16
Jun 26, 2017
fd8b9e2
add shipping method ups freight for get shipping rates
TusharSangani Jan 22, 2018
2e7edad
apply code review change for ups freight shipping module
TusharSangani Jan 24, 2018
13223d4
Merge pull request #64 from TusharSangani/issues-59-upsfreight
Jan 25, 2018
afb6790
Missing updates from the previous PR
WillStrohl Jan 26, 2018
ace9a6a
Merge pull request #65 from hismightiness/Issues/Issue-59-Updates
Jan 26, 2018
960d1bc
fix null reference exception during get freight shipping rates when a…
TusharSangani Jan 29, 2018
337d285
Merge pull request #66 from TusharSangani/issues-59-upsfreight
Jan 29, 2018
3aca026
Merge pull request #68 from HotcakesCommerce/development
Feb 2, 2018
a7c6b3c
Merge remote-tracking branch 'origin/development' into releases/03.01.00
WillStrohl Feb 13, 2018
4bfd0d6
Merge pull request #76 from hismightiness/releases/03.01.00
Feb 13, 2018
8eb91c3
Merge branch 'master' into releases/03.01.00
Feb 13, 2018
f587598
Merge pull request #78 from hismightiness/releases/03.01.00
Feb 13, 2018
717158b
Merge remote-tracking branch 'upstream/master'
WillStrohl Feb 13, 2018
2138428
Merge pull request #81 from hismightiness/tasks/missing-03.01.00-pack…
Feb 14, 2018
65e97c0
Merge pull request #82 from hismightiness/tasks/missing-03.01.00-pack…
Feb 14, 2018
fb8ef9e
Merge pull request #83 from HotcakesCommerce/releases/03.01.00
Feb 14, 2018
5d9f135
Merge pull request #84 from HotcakesCommerce/development
Feb 14, 2018
bf8491b
Removing the SKU from the footer in the admin views to resolve issue #16
WillStrohl Feb 27, 2018
b174190
Merge pull request #95 from hismightiness/Issues/Issue-16
Feb 27, 2018
739ba47
Resolves issue #55
WillStrohl Feb 27, 2018
a386d67
Merge pull request #96 from hismightiness/Issues/Issue-55
Feb 27, 2018
89b9d68
Tax Calculation after discount get deducted to resolved issue #91
ketangarala Mar 1, 2018
33a7c60
Added missing "freight" reference
Mar 9, 2018
6456fa0
merge from issue-59 to local branch
TusharSangani Mar 10, 2018
4a62627
fix critical error of load Edit Shipping Method UI
TusharSangani Mar 10, 2018
47641e9
Merge pull request #100 from TusharSangani/issues-59-upsfreight
Mar 29, 2018
48c0a95
Merge remote-tracking branch 'origin/development' into Issues/Issue-59
WillStrohl Mar 29, 2018
2dd30fb
Revert "Merge remote-tracking branch 'origin/development' into Issues…
WillStrohl Mar 29, 2018
7ddef96
Merge pull request #117 from hismightiness/Issues/Issue-59
Mar 29, 2018
9780463
Merge pull request #118 from HotcakesCommerce/Issues/Issue-59
Mar 29, 2018
78f8964
Merge pull request #97 from ketangarala/Issues/Issue-91
Mar 29, 2018
5897509
Updates in preparation for the 3.2 release
WillStrohl Mar 29, 2018
e6d81d3
Stop tracking MS Build log file (... AGAIN!)
WillStrohl Mar 29, 2018
a45cf87
Updated the release notes for 3.2
WillStrohl Mar 29, 2018
2faf0a6
ignore ._ files
Apr 10, 2018
084153a
When going to the payment error action do not check for a CurrentCart…
Apr 10, 2018
5ebb92d
Merge pull request #121 from mtrutledge/Issues/Issue-120
Apr 13, 2018
199d266
Final updates for 03.02.00 release
WillStrohl Apr 13, 2018
b6c9c8b
Added HCC update service missing from the webdeploy package
WillStrohl Apr 13, 2018
94161c0
Issue99: SI: Printing multiple orders from order manager no longer in…
ketangarala Jul 11, 2018
8d5162a
#99 SI: Printing multiple orders from order manager no longer include…
ketangarala Jul 11, 2018
50b4d23
Merge branch 'Issues/Issue-99' of https://github.com/ketangarala/core…
ketangarala Jul 12, 2018
a91e9b5
SI: Printing multiple orders from order manager no longer includes bu…
ketangarala Jul 12, 2018
1383960
Merge branch 'Issues/Issue-99' of https://github.com/ketangarala/core…
ketangarala Jul 12, 2018
9c4c4d9
Merge pull request #137 from ketangarala/Issues/Issue-99
Jul 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
HotcakesCommerce#99 SI: Printing multiple orders from order manager n…
…o longer includes built-in page breaks between orders
  • Loading branch information
ketangarala committed Jul 12, 2018
commit 8d5162a6694224fca751c33cb9d8dce3c1eb163b
88 changes: 47 additions & 41 deletions Website/DesktopModules/Hotcakes/Core/Admin/Orders/PrintOrder.aspx
Original file line number Diff line number Diff line change
@@ -3,54 +3,60 @@
<%@ Register Src="OrderActions.ascx" TagName="OrderActions" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HccAdminPopupConent" runat="Server">

<script type="text/javascript">
function doPrint() {
if (window.print) {
window.print();
} else {
alert('Please choose the print button from your browser. Usually in the menu dropdowns at File: Print');
}
}
<script type="text/javascript">
function doPrint() {
if (window.print) {
window.print();
} else {
alert('Please choose the print button from your browser. Usually in the menu dropdowns at File: Print');
}
}

jQuery(function ($) {
if (hcc.getUrlVar('autoprint') == "1") {
doPrint();
}
});
</script>
jQuery(function ($) {
if (hcc.getUrlVar('autoprint') == "1") {
doPrint();
}
});
</script>

<div style="background: #fff; padding: 10px;">
<div class="hcNavContent printhidden">
<uc1:OrderActions ID="OrderActions1" HideActions="true" runat="server" />
<div style="background: #fff; padding: 10px;">
<div class="hcNavContent printhidden">
<uc1:OrderActions ID="OrderActions1" HideActions="true" runat="server" />

<div class="hcBlockNoBorder">
<asp:LinkButton ID="lnkPrintNow" runat="server" Text="Print" CssClass="hcPrimaryAction" OnClientClick="javascript:doPrint();" />
</div>
</div>
<div class="hcMainContent printhidden">
<h1>Print Order</h1>
Template:
<div class="hcBlockNoBorder">
<asp:LinkButton ID="lnkPrintNow" runat="server" Text="Print" CssClass="hcPrimaryAction" OnClientClick="javascript:doPrint();" />
</div>
</div>
<div class="hcMainContent printhidden">
<h1>Print Order</h1>
Template:
<asp:DropDownList ID="TemplateField" runat="Server"></asp:DropDownList>
<asp:ImageButton ID="btnGenerate" runat="server"
ImageUrl="~/DesktopModules/Hotcakes/Core/Admin/Images/Buttons/Go.png" OnClick="btnGenerate_Click" />
</div>
<div class="printbackground">
<asp:DataList BackColor="#FFFFFF" ID="DataList1" runat="server" Width="100%" OnItemDataBound="DataList1_ItemDataBound">
</div>
<div class="printbackground">
<asp:repeater id="rpOrder" runat="server" OnItemDataBound="rpOrder_ItemDataBound">
<ItemTemplate>
<div class="printhidden">
<hr />
</div>
<asp:Literal ID="litTemplate" runat="server"></asp:Literal>
<table style="width:100%; background-color:#FFFFFF">
<tbody>
<tr>
<td>
<div class="printhidden">
<hr />
</div>
<asp:Literal ID="litTemplate" runat="server"></asp:Literal>
</td>
</tr>
</tbody>
</table>
<div id="pagebreak" runat="server">&nbsp;</div>
</ItemTemplate>
<SeparatorTemplate>
<div style="page-break-after: always;">&nbsp;</div>
</SeparatorTemplate>
</asp:DataList>
</div>
<div class="printhidden clear">
<asp:ImageButton ID="btnContinue2" runat="server" ImageUrl="~/DesktopModules/Hotcakes/Core/Admin/Images/Buttons/Ok.png" OnClick="btnContinue2_Click" />
</div>
</asp:repeater>
</div>
<div class="printhidden clear">
<asp:ImageButton ID="btnContinue2" runat="server" ImageUrl="~/DesktopModules/Hotcakes/Core/Admin/Images/Buttons/Ok.png" OnClick="btnContinue2_Click" />
</div>

<div class="clear"></div>
</div>
<div class="clear"></div>
</div>
</asp:Content>
Original file line number Diff line number Diff line change
@@ -141,28 +141,41 @@ private void Generate()
var id = Request.QueryString["id"];
id = id.TrimEnd(',');
var os = id.Split(',');
DataList1.DataSource = os;
DataList1.DataBind();
rpOrder.DataSource = os;
rpOrder.DataBind();
}

protected void DataList1_ItemDataBound(object sender, DataListItemEventArgs e)
protected void rpOrder_ItemDataBound(Object Sender, RepeaterItemEventArgs e)
{

if (e.Item.ItemType == ListItemType.AlternatingItem | e.Item.ItemType == ListItemType.Item)
{
long templateId = 0;
long.TryParse(TemplateField.SelectedValue, out templateId);
var t = HccApp.ContentServices.HtmlTemplates.Find(templateId);
if (t != null)
{
var orderId = (string) e.Item.DataItem;
var orderId = (string)e.Item.DataItem;
var o = HccApp.OrderServices.Orders.FindForCurrentStore(orderId);
var litTemplate = (Literal) e.Item.FindControl("litTemplate");
var litTemplate = (Literal)e.Item.FindControl("litTemplate");
if (litTemplate != null)
{
t = t.ReplaceTagsInTemplateForOrder(HccApp.CurrentRequestContext, o);
litTemplate.Text = t.Body;
}
}

var id = Request.QueryString["id"];
if (!string.IsNullOrEmpty(id))
{
var count = id.TrimEnd(',').Split(',').Length;
if (e.Item.ItemIndex != count - 1)
{
System.Web.UI.HtmlControls.HtmlGenericControl div = (System.Web.UI.HtmlControls.HtmlGenericControl)e.Item.FindControl("pagebreak");
div.Attributes.Add("style", "page-break-after: always;");
}
}

}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.