Skip to content

#636 Add subtotal Discount / Surcharge #643

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.

Sign up for GitHub

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

Open
diego-santinelli-hrm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

#636 Add subtotal Discount / Surcharge #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad8f197
Add subtotal Discount / Surcharge
diego-santinelli-hrm Mar 24, 2026
e009e1b
using 0x0100 and 0x0200 instead.
diego-santinelli-hrm Apr 7, 2026
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
4 changes: 4 additions & 0 deletions scu-it/src/fiskaltrust.Middleware.SCU.IT.Abstraction/ReceiptCaseHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public static class ReceiptCaseHelper
public static bool IsSingleUseVoucher(this ChargeItem chargeItem) => (chargeItem.ftChargeItemCase & 0x0000_0000_0000_00F0) == 0x40 && !IsMultiUseVoucher(chargeItem);

public static bool IsMultiUseVoucher(this ChargeItem chargeItem) => (chargeItem.ftChargeItemCase & 0x0000_0000_0000_00FF) == 0x48;

public static bool IsSubtotalDiscount(this ChargeItem chargeItem) => (chargeItem.ftChargeItemCase & 0x0000_0FFF_0000_0000) == 0x0000_0100_0000_0000;

public static bool IsSubtotalSurcharge(this ChargeItem chargeItem) => (chargeItem.ftChargeItemCase & 0x0000_0FFF_0000_0000) == 0x0000_0200_0000_0000;

public static bool IsRefund(this PayItem payItem) => (payItem.ftPayItemCase & 0x0000_0000_0002_0000) > 0x0000;

Expand Down
34 changes: 33 additions & 1 deletion scu-it/src/fiskaltrust.Middleware.SCU.IT.EpsonRTPrinter/Utilities/EpsonCommandFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ public static FiscalReceipt CreateInvoiceRequestContent(EpsonRTPrinterSCUConfigu
var fiscalReceipt = new FiscalReceipt();
fiscalReceipt.ItemAndMessages = GetItemAndMessages(receiptRequest);
fiscalReceipt.AdjustmentAndMessages = new List<AdjustmentAndMessage>();
fiscalReceipt.PrintRecSubtotalAdjustment = GetSubtotalAdjustments(receiptRequest);
fiscalReceipt.RecTotalAndMessages = GetTotalAndMessages(receiptRequest);
var customerData = receiptRequest.GetCustomer();
if (customerData != null)
Expand Down Expand Up @@ -603,6 +604,8 @@ public static List<ItemAndMessage> GetItemAndMessages(ReceiptRequest receiptRequ
// Todo handle payment adjustments / discounts
foreach (var i in receiptRequest.cbChargeItems)
{
if (i.IsSubtotalDiscount() || i.IsSubtotalSurcharge())
continue;
GenerateItems(itemAndMessages, i);
}
}
Expand Down Expand Up @@ -700,6 +703,35 @@ private static void GenerateItems(List<ItemAndMessage> itemAndMessages, ChargeIt
}
}

public static List<PrintRecSubtotalAdjustment> GetSubtotalAdjustments(ReceiptRequest receiptRequest)
{
var adjustments = new List<PrintRecSubtotalAdjustment>();
foreach (var i in receiptRequest.cbChargeItems)
{
if (i.IsSubtotalDiscount())
{
adjustments.Add(new PrintRecSubtotalAdjustment
{
Description = i.Description,
Amount = Math.Abs(i.Amount),
AdjustmentType = 1,
Justification = 1
});
}
else if (i.IsSubtotalSurcharge())
{
adjustments.Add(new PrintRecSubtotalAdjustment
{
Description = i.Description,
Amount = Math.Abs(i.Amount),
AdjustmentType = 6,
Justification = 1
});
}
}
return adjustments.Count > 0 ? adjustments : null;
}

public static List<TotalAndMessage> GetTotalAndMessages(ReceiptRequest request)
{
var totalAndMessages = new List<TotalAndMessage>();
Expand All @@ -711,7 +743,7 @@ public static List<TotalAndMessage> GetTotalAndMessages(ReceiptRequest request)
Description = pay.Description,
PaymentType = paymentType.PaymentType,
Index = paymentType.Index,
Payment = (request.IsRefund() || request.IsVoid() || pay.IsRefund() || pay.IsVoid()) ? Math.Abs(pay.Amount) : pay.Amount,
Payment = (request.IsRefund() || request.IsVoid() || pay.IsRefund() || pay.IsVoid() || pay.Amount < 0) ? Math.Abs(pay.Amount) : pay.Amount,
};
PrintRecMessage? printRecMessage = null;
totalAndMessages.Add(new()
Expand Down
Loading