Skip to content

Commit

Permalink
VAT Rounding: InvoiceIdent per Store:
Browse files Browse the repository at this point in the history
fixes Itext7 back to 7.0.1
7.0.2 throws error when using PdfFontFactory.CreateFont
  • Loading branch information
Markus Falk committed Feb 23, 2017
1 parent 1733bb8 commit c65b3bc
Show file tree
Hide file tree
Showing 14 changed files with 23,340 additions and 23,281 deletions.
282 changes: 141 additions & 141 deletions src/Libraries/Nop.Core/Domain/Orders/OrderSettings.cs
Original file line number Diff line number Diff line change
@@ -1,142 +1,142 @@
using Nop.Core.Configuration;

namespace Nop.Core.Domain.Orders
{
public class OrderSettings : ISettings
{
/// <summary>
/// Gets or sets a value indicating whether customer can make re-order
/// </summary>
public bool IsReOrderAllowed { get; set; }

/// <summary>
/// Gets or sets a minimum order subtotal amount
/// </summary>
public decimal MinOrderSubtotalAmount { get; set; }
/// <summary>
/// Gets or sets a value indicating whether 'Minimum order subtotal amount' option
/// should be evaluated over 'X' value including tax or not
/// </summary>
public bool MinOrderSubtotalAmountIncludingTax { get; set; }
/// <summary>
/// Gets or sets a minimum order total amount
/// </summary>
public decimal MinOrderTotalAmount { get; set; }

/// <summary>
/// Gets or sets a value indicating whether automatically update order totals on editing an order in admin area
/// </summary>
public bool AutoUpdateOrderTotalsOnEditingOrder { get; set; }

/// <summary>
/// Gets or sets a value indicating whether anonymous checkout allowed
/// </summary>
public bool AnonymousCheckoutAllowed { get; set; }

/// <summary>
/// Gets or sets a value indicating whether 'Terms of service' enabled on the shopping cart page
/// </summary>
public bool TermsOfServiceOnShoppingCartPage { get; set; }
/// <summary>
/// Gets or sets a value indicating whether 'Terms of service' enabled on the order confirmation page
/// </summary>
public bool TermsOfServiceOnOrderConfirmPage { get; set; }

/// <summary>
/// Gets or sets a value indicating whether 'One-page checkout' is enabled
/// </summary>
public bool OnePageCheckoutEnabled { get; set; }

/// <summary>
/// Gets or sets a value indicating whether order totals should be displayed on 'Payment info' tab of 'One-page checkout' page
/// </summary>
public bool OnePageCheckoutDisplayOrderTotalsOnPaymentInfoTab { get; set; }
/// <summary>
/// Gets or sets a value indicating whether "Billing address" step should be skipped
/// </summary>
public bool DisableBillingAddressCheckoutStep { get; set; }
/// <summary>
/// Gets or sets a value indicating whether "Order completed" page should be skipped
/// </summary>
public bool DisableOrderCompletedPage { get; set; }

/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order placed" email
/// </summary>
public bool AttachPdfInvoiceToOrderPlacedEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order paid" email
/// </summary>
public bool AttachPdfInvoiceToOrderPaidEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order completed" email
/// </summary>
public bool AttachPdfInvoiceToOrderCompletedEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we PDF invoices should be generated in customer language. Otherwise, use the current one
/// </summary>
public bool GeneratePdfInvoiceInCustomerLanguage { get; set; }

/// <summary>
/// Gets or sets a value indicating whether "Return requests" are allowed
/// </summary>
public bool ReturnRequestsEnabled { get; set; }
/// <summary>
/// Gets or sets a value indicating whether customers are allowed to upload files
/// </summary>
public bool ReturnRequestsAllowFiles { get; set; }
/// <summary>
/// Gets or sets maximum file size for upload file (return request). Set 0 to allow any file size
/// </summary>
public int ReturnRequestsFileMaximumSize { get; set; }
/// <summary>
/// Gets or sets a value "Return requests" number mask
/// </summary>
public string ReturnRequestNumberMask { get; set; }
/// <summary>
/// Gets or sets a number of days that the Return Request Link will be available for customers after order placing.
/// </summary>
public int NumberOfDaysReturnRequestAvailable { get; set; }

/// <summary>
/// Gets or sets a value indicating whether to activate related gift cards after completing the order
/// </summary>
public bool ActivateGiftCardsAfterCompletingOrder { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to deactivate related gift cards after cancelling the order
/// </summary>
public bool DeactivateGiftCardsAfterCancellingOrder { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to deactivate related gift cards after deleting the order
/// </summary>
public bool DeactivateGiftCardsAfterDeletingOrder { get; set; }

/// <summary>
/// Gets or sets an order placement interval in seconds (prevent 2 orders being placed within an X seconds time frame).
/// </summary>
public int MinimumOrderPlacementInterval { get; set; }

/// <summary>
/// Gets or sets a value indicating whether an order status should be set to "Complete" only when its shipping status is "Delivered". Otherwise, "Shipped" status will be enough.
/// </summary>
public bool CompleteOrderWhenDelivered { get; set; }
/// <summary>
/// Last issued Invoice Id
/// </summary>
public int InvoiceIdent { get; set; }
/// <summary>
/// Last issued Invoice Date
/// </summary>
public int InvoiceYear { get; set; }

/// <summary>
/// Gets or sets a custom order number mask
/// </summary>
public string CustomOrderNumberMask { get; set; }

/// <summary>
/// Gets or sets a value indicating whether the orders need to be exported with their products
/// </summary>
public bool ExportWithProducts { get; set; }
}
using Nop.Core.Configuration;

namespace Nop.Core.Domain.Orders
{
public class OrderSettings : ISettings
{
/// <summary>
/// Gets or sets a value indicating whether customer can make re-order
/// </summary>
public bool IsReOrderAllowed { get; set; }

/// <summary>
/// Gets or sets a minimum order subtotal amount
/// </summary>
public decimal MinOrderSubtotalAmount { get; set; }
/// <summary>
/// Gets or sets a value indicating whether 'Minimum order subtotal amount' option
/// should be evaluated over 'X' value including tax or not
/// </summary>
public bool MinOrderSubtotalAmountIncludingTax { get; set; }
/// <summary>
/// Gets or sets a minimum order total amount
/// </summary>
public decimal MinOrderTotalAmount { get; set; }

/// <summary>
/// Gets or sets a value indicating whether automatically update order totals on editing an order in admin area
/// </summary>
public bool AutoUpdateOrderTotalsOnEditingOrder { get; set; }

/// <summary>
/// Gets or sets a value indicating whether anonymous checkout allowed
/// </summary>
public bool AnonymousCheckoutAllowed { get; set; }

/// <summary>
/// Gets or sets a value indicating whether 'Terms of service' enabled on the shopping cart page
/// </summary>
public bool TermsOfServiceOnShoppingCartPage { get; set; }
/// <summary>
/// Gets or sets a value indicating whether 'Terms of service' enabled on the order confirmation page
/// </summary>
public bool TermsOfServiceOnOrderConfirmPage { get; set; }

/// <summary>
/// Gets or sets a value indicating whether 'One-page checkout' is enabled
/// </summary>
public bool OnePageCheckoutEnabled { get; set; }

/// <summary>
/// Gets or sets a value indicating whether order totals should be displayed on 'Payment info' tab of 'One-page checkout' page
/// </summary>
public bool OnePageCheckoutDisplayOrderTotalsOnPaymentInfoTab { get; set; }
/// <summary>
/// Gets or sets a value indicating whether "Billing address" step should be skipped
/// </summary>
public bool DisableBillingAddressCheckoutStep { get; set; }
/// <summary>
/// Gets or sets a value indicating whether "Order completed" page should be skipped
/// </summary>
public bool DisableOrderCompletedPage { get; set; }

/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order placed" email
/// </summary>
public bool AttachPdfInvoiceToOrderPlacedEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order paid" email
/// </summary>
public bool AttachPdfInvoiceToOrderPaidEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we should attach PDF invoice to "Order completed" email
/// </summary>
public bool AttachPdfInvoiceToOrderCompletedEmail { get; set; }
/// <summary>
/// Gets or sets a value indicating we PDF invoices should be generated in customer language. Otherwise, use the current one
/// </summary>
public bool GeneratePdfInvoiceInCustomerLanguage { get; set; }

/// <summary>
/// Gets or sets a value indicating whether "Return requests" are allowed
/// </summary>
public bool ReturnRequestsEnabled { get; set; }
/// <summary>
/// Gets or sets a value indicating whether customers are allowed to upload files
/// </summary>
public bool ReturnRequestsAllowFiles { get; set; }
/// <summary>
/// Gets or sets maximum file size for upload file (return request). Set 0 to allow any file size
/// </summary>
public int ReturnRequestsFileMaximumSize { get; set; }
/// <summary>
/// Gets or sets a value "Return requests" number mask
/// </summary>
public string ReturnRequestNumberMask { get; set; }
/// <summary>
/// Gets or sets a number of days that the Return Request Link will be available for customers after order placing.
/// </summary>
public int NumberOfDaysReturnRequestAvailable { get; set; }

/// <summary>
/// Gets or sets a value indicating whether to activate related gift cards after completing the order
/// </summary>
public bool ActivateGiftCardsAfterCompletingOrder { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to deactivate related gift cards after cancelling the order
/// </summary>
public bool DeactivateGiftCardsAfterCancellingOrder { get; set; }
/// <summary>
/// Gets or sets a value indicating whether to deactivate related gift cards after deleting the order
/// </summary>
public bool DeactivateGiftCardsAfterDeletingOrder { get; set; }

/// <summary>
/// Gets or sets an order placement interval in seconds (prevent 2 orders being placed within an X seconds time frame).
/// </summary>
public int MinimumOrderPlacementInterval { get; set; }

/// <summary>
/// Gets or sets a value indicating whether an order status should be set to "Complete" only when its shipping status is "Delivered". Otherwise, "Shipped" status will be enough.
/// </summary>
public bool CompleteOrderWhenDelivered { get; set; }
/// <summary>
/// Last issued Invoice Id
/// </summary>
public int InvoiceIdent { get; set; }
/// <summary>
/// Last issued Invoice Year
/// </summary>
public int InvoiceYear { get; set; }

/// <summary>
/// Gets or sets a custom order number mask
/// </summary>
public string CustomOrderNumberMask { get; set; }

/// <summary>
/// Gets or sets a value indicating whether the orders need to be exported with their products
/// </summary>
public bool ExportWithProducts { get; set; }
}
}
28 changes: 14 additions & 14 deletions src/Libraries/Nop.Services/Nop.Services.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,32 +52,32 @@
<HintPath>..\..\packages\ImageResizer.Plugins.PrettyGifs.4.0.5\lib\net45\ImageResizer.Plugins.PrettyGifs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.barcodes, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.barcodes.dll</HintPath>
<Reference Include="itext.barcodes, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.barcodes.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.forms, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.forms.dll</HintPath>
<Reference Include="itext.forms, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.io, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.io.dll</HintPath>
<Reference Include="itext.io, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.io.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.kernel, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.kernel.dll</HintPath>
<Reference Include="itext.kernel, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.kernel.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.layout, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.layout.dll</HintPath>
<Reference Include="itext.layout, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.layout.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.pdfa, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.pdfa.dll</HintPath>
<Reference Include="itext.pdfa, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.pdfa.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itext.sign, Version=7.0.2.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.2\lib\net40\itext.sign.dll</HintPath>
<Reference Include="itext.sign, Version=7.0.1.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
<HintPath>..\..\packages\itext7.7.0.1\lib\net40\itext.sign.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="itextsharp, Version=5.5.10.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca, processorArchitecture=MSIL">
Expand Down

0 comments on commit c65b3bc

Please sign in to comment.