Add retry field to vender events.

Add download, export and view PIN user permissions.

BulkPrintingAPI/Controllers/Utils.cs

@@ -181,6 +181,11 @@ namespace BulkPrintingAPI.Controllers
                 existingUser.OfflineReprintValue = user.OfflineReprintValue;
                 existingUser.OnlinePrintValue = user.OnlinePrintValue;
                 existingUser.OnlineReprintValue = user.OnlineReprintValue;
+                existingUser.BulkExport = user.BulkExport;
+                existingUser.BulkExportMaxValue = user.BulkExportMaxValue;
+                existingUser.BulkOrder = user.BulkOrder;
+                existingUser.BulkOrderMaxValue = user.BulkOrderMaxValue;
+                existingUser.BulkViewPins = user.BulkViewPins;
 
                 user = existingUser;
             }

BulkPrintingAPI/Controllers/VendorEventsController.cs

@@ -33,6 +33,8 @@ namespace BulkPrintingAPI.Controllers
 
             [Required]
             public VendorEvent.VendorEventType? EventType { get; set; }
+
+            public bool Retry { get; set; }
         }
 
         public VendorEventsController(MAXContext context)
@@ -83,7 +85,8 @@ namespace BulkPrintingAPI.Controllers
                     VendorId = remoteEvent.VendorId.Value,
                     VoucherId = remoteEvent.VoucherId,
                     EventType = remoteEvent.EventType.Value,
-                    EventDate = remoteEvent.EventDate.Value.ToUniversalTime()
+                    EventDate = remoteEvent.EventDate.Value.ToUniversalTime(),
+                    Retry = remoteEvent.Retry
                 });
             }
 

BulkPrintingAPI/Migrations/20170821080542_AddVendorEventRetryField.Designer.cs

@@ -0,0 +1,285 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using MAX.Models;
+
+namespace BulkPrintingAPI.Migrations
+{
+    [DbContext(typeof(MAXContext))]
+    [Migration("20170821080542_AddVendorEventRetryField")]
+    partial class AddVendorEventRetryField
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+            modelBuilder
+                .HasAnnotation("ProductVersion", "1.1.2")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("MAX.Models.Account", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<decimal>("Balance");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<string>("Reference")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("Status");
+
+                    b.Property<int>("WarehouseId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WarehouseId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("MAX.Models.Batch", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<decimal>("Cost");
+
+                    b.Property<int>("DeliveredQuantity");
+
+                    b.Property<decimal>("DiscountPercentage");
+
+                    b.Property<decimal>("FaceValue");
+
+                    b.Property<int>("NetworkId");
+
+                    b.Property<string>("NetworkName")
+                        .IsRequired()
+                        .HasMaxLength(20);
+
+                    b.Property<DateTimeOffset>("OrderDate");
+
+                    b.Property<Guid?>("OrderGuid");
+
+                    b.Property<string>("OrderReference")
+                        .IsRequired()
+                        .HasMaxLength(20);
+
+                    b.Property<int>("OrderedById");
+
+                    b.Property<string>("ProductDescription")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("ProductId");
+
+                    b.Property<bool>("ReadyForDownload");
+
+                    b.Property<int>("RequestedQuantity");
+
+                    b.Property<int>("VendorId");
+
+                    b.Property<int>("VoucherType");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("OrderGuid")
+                        .IsUnique();
+
+                    b.HasIndex("ReadyForDownload", "OrderDate");
+
+                    b.ToTable("Batches");
+                });
+
+            modelBuilder.Entity("MAX.Models.User", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<bool>("CanPrintOffline");
+
+                    b.Property<bool>("CanPrintOnline");
+
+                    b.Property<bool>("CanReprintOffline");
+
+                    b.Property<bool>("CanReprintOnline");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<DateTimeOffset>("LastLogin");
+
+                    b.Property<int>("Level");
+
+                    b.Property<decimal>("OfflinePrintValue");
+
+                    b.Property<decimal>("OfflineReprintValue");
+
+                    b.Property<decimal>("OnlinePrintValue");
+
+                    b.Property<decimal>("OnlineReprintValue");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("System");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("MAX.Models.Vendor", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<byte[]>("EncryptedDatabasePassword")
+                        .IsRequired()
+                        .HasMaxLength(32);
+
+                    b.Property<byte[]>("EncryptedVoucherKey")
+                        .IsRequired()
+                        .HasMaxLength(32);
+
+                    b.Property<int?>("LastVendorEventRemoteId");
+
+                    b.Property<string>("SerialNumber")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.ToTable("Vendors");
+                });
+
+            modelBuilder.Entity("MAX.Models.VendorEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("EventDate");
+
+                    b.Property<int>("EventType");
+
+                    b.Property<int?>("RemoteId");
+
+                    b.Property<bool>("Retry");
+
+                    b.Property<int>("UserId");
+
+                    b.Property<int>("VendorId");
+
+                    b.Property<int?>("VoucherId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VendorId", "RemoteId")
+                        .IsUnique();
+
+                    b.ToTable("VendorEvents");
+                });
+
+            modelBuilder.Entity("MAX.Models.Voucher", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("BatchId");
+
+                    b.Property<string>("EncryptedPIN")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("Date");
+
+                    b.Property<int>("SequenceNumber");
+
+                    b.Property<string>("Serial")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BatchId", "SequenceNumber")
+                        .IsUnique();
+
+                    b.ToTable("Vouchers");
+                });
+
+            modelBuilder.Entity("MAX.Models.Warehouse", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Warehouses");
+                });
+
+            modelBuilder.Entity("MAX.Models.Account", b =>
+                {
+                    b.HasOne("MAX.Models.Warehouse", "Warehouse")
+                        .WithMany("Accounts")
+                        .HasForeignKey("WarehouseId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Batch", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany()
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.User", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany("Users")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Vendor", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany("Vendors")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Voucher", b =>
+                {
+                    b.HasOne("MAX.Models.Batch", "Batch")
+                        .WithMany("Vouchers")
+                        .HasForeignKey("BatchId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+        }
+    }
+}

BulkPrintingAPI/Migrations/20170821080542_AddVendorEventRetryField.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BulkPrintingAPI.Migrations
+{
+    public partial class AddVendorEventRetryField : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Retry",
+                table: "VendorEvents",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Retry",
+                table: "VendorEvents");
+        }
+    }
+}

BulkPrintingAPI/Migrations/20170823095121_AddExportOrderViewPinUserPermissions.Designer.cs

@@ -0,0 +1,295 @@
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using MAX.Models;
+
+namespace BulkPrintingAPI.Migrations
+{
+    [DbContext(typeof(MAXContext))]
+    [Migration("20170823095121_AddExportOrderViewPinUserPermissions")]
+    partial class AddExportOrderViewPinUserPermissions
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+            modelBuilder
+                .HasAnnotation("ProductVersion", "1.1.2")
+                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+            modelBuilder.Entity("MAX.Models.Account", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<decimal>("Balance");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<string>("Reference")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("Status");
+
+                    b.Property<int>("WarehouseId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WarehouseId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("MAX.Models.Batch", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<decimal>("Cost");
+
+                    b.Property<int>("DeliveredQuantity");
+
+                    b.Property<decimal>("DiscountPercentage");
+
+                    b.Property<decimal>("FaceValue");
+
+                    b.Property<int>("NetworkId");
+
+                    b.Property<string>("NetworkName")
+                        .IsRequired()
+                        .HasMaxLength(20);
+
+                    b.Property<DateTimeOffset>("OrderDate");
+
+                    b.Property<Guid?>("OrderGuid");
+
+                    b.Property<string>("OrderReference")
+                        .IsRequired()
+                        .HasMaxLength(20);
+
+                    b.Property<int>("OrderedById");
+
+                    b.Property<string>("ProductDescription")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("ProductId");
+
+                    b.Property<bool>("ReadyForDownload");
+
+                    b.Property<int>("RequestedQuantity");
+
+                    b.Property<int>("VendorId");
+
+                    b.Property<int>("VoucherType");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.HasIndex("OrderGuid")
+                        .IsUnique();
+
+                    b.HasIndex("ReadyForDownload", "OrderDate");
+
+                    b.ToTable("Batches");
+                });
+
+            modelBuilder.Entity("MAX.Models.User", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<bool>("BulkExport");
+
+                    b.Property<decimal>("BulkExportMaxValue");
+
+                    b.Property<bool>("BulkOrder");
+
+                    b.Property<decimal>("BulkOrderMaxValue");
+
+                    b.Property<bool>("BulkViewPins");
+
+                    b.Property<bool>("CanPrintOffline");
+
+                    b.Property<bool>("CanPrintOnline");
+
+                    b.Property<bool>("CanReprintOffline");
+
+                    b.Property<bool>("CanReprintOnline");
+
+                    b.Property<bool>("Enabled");
+
+                    b.Property<string>("FirstName")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<DateTimeOffset>("LastLogin");
+
+                    b.Property<int>("Level");
+
+                    b.Property<decimal>("OfflinePrintValue");
+
+                    b.Property<decimal>("OfflineReprintValue");
+
+                    b.Property<decimal>("OnlinePrintValue");
+
+                    b.Property<decimal>("OnlineReprintValue");
+
+                    b.Property<string>("Surname")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<int>("System");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("MAX.Models.Vendor", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("AccountId");
+
+                    b.Property<byte[]>("EncryptedDatabasePassword")
+                        .IsRequired()
+                        .HasMaxLength(32);
+
+                    b.Property<byte[]>("EncryptedVoucherKey")
+                        .IsRequired()
+                        .HasMaxLength(32);
+
+                    b.Property<int?>("LastVendorEventRemoteId");
+
+                    b.Property<string>("SerialNumber")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccountId");
+
+                    b.ToTable("Vendors");
+                });
+
+            modelBuilder.Entity("MAX.Models.VendorEvent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTimeOffset>("EventDate");
+
+                    b.Property<int>("EventType");
+
+                    b.Property<int?>("RemoteId");
+
+                    b.Property<bool>("Retry");
+
+                    b.Property<int>("UserId");
+
+                    b.Property<int>("VendorId");
+
+                    b.Property<int?>("VoucherId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("VendorId", "RemoteId")
+                        .IsUnique();
+
+                    b.ToTable("VendorEvents");
+                });
+
+            modelBuilder.Entity("MAX.Models.Voucher", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<int>("BatchId");
+
+                    b.Property<string>("EncryptedPIN")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("Date");
+
+                    b.Property<int>("SequenceNumber");
+
+                    b.Property<string>("Serial")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BatchId", "SequenceNumber")
+                        .IsUnique();
+
+                    b.ToTable("Vouchers");
+                });
+
+            modelBuilder.Entity("MAX.Models.Warehouse", b =>
+                {
+                    b.Property<int>("Id");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(50);
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Warehouses");
+                });
+
+            modelBuilder.Entity("MAX.Models.Account", b =>
+                {
+                    b.HasOne("MAX.Models.Warehouse", "Warehouse")
+                        .WithMany("Accounts")
+                        .HasForeignKey("WarehouseId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Batch", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany()
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.User", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany("Users")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Vendor", b =>
+                {
+                    b.HasOne("MAX.Models.Account", "Account")
+                        .WithMany("Vendors")
+                        .HasForeignKey("AccountId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("MAX.Models.Voucher", b =>
+                {
+                    b.HasOne("MAX.Models.Batch", "Batch")
+                        .WithMany("Vouchers")
+                        .HasForeignKey("BatchId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+        }
+    }
+}

BulkPrintingAPI/Migrations/20170823095121_AddExportOrderViewPinUserPermissions.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace BulkPrintingAPI.Migrations
+{
+    public partial class AddExportOrderViewPinUserPermissions : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "BulkExport",
+                table: "Users",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "BulkExportMaxValue",
+                table: "Users",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "BulkOrder",
+                table: "Users",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "BulkOrderMaxValue",
+                table: "Users",
+                nullable: false,
+                defaultValue: 0m);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "BulkViewPins",
+                table: "Users",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "BulkExport",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "BulkExportMaxValue",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "BulkOrder",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "BulkOrderMaxValue",
+                table: "Users");
+
+            migrationBuilder.DropColumn(
+                name: "BulkViewPins",
+                table: "Users");
+        }
+    }
+}

BulkPrintingAPI/Migrations/MAXContextModelSnapshot.cs

@@ -103,6 +103,16 @@ namespace BulkPrintingAPI.Migrations
 
                     b.Property<int>("AccountId");
 
+                    b.Property<bool>("BulkExport");
+
+                    b.Property<decimal>("BulkExportMaxValue");
+
+                    b.Property<bool>("BulkOrder");
+
+                    b.Property<decimal>("BulkOrderMaxValue");
+
+                    b.Property<bool>("BulkViewPins");
+
                     b.Property<bool>("CanPrintOffline");
 
                     b.Property<bool>("CanPrintOnline");
@@ -184,6 +194,8 @@ namespace BulkPrintingAPI.Migrations
 
                     b.Property<int?>("RemoteId");
 
+                    b.Property<bool>("Retry");
+
                     b.Property<int>("UserId");
 
                     b.Property<int>("VendorId");

BulkPrintingAPI/Properties/PublishProfiles/FolderProfile.pubxml

@@ -17,4 +17,4 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <publishUrl>bin\Release\PublishOutput</publishUrl>
     <DeleteExistingFiles>False</DeleteExistingFiles>
   </PropertyGroup>
-</Project>
+</Project>

MAXClient/Client.cs

@@ -146,6 +146,11 @@ namespace MAX
                     user.OfflineReprintValue = decimal.Parse(parts[12]);
                     user.CanReprintOnline = bool.Parse(parts[13]);
                     user.OnlineReprintValue = decimal.Parse(parts[14]);
+                    user.BulkExport = bool.Parse(parts[15]);
+                    user.BulkExportMaxValue = decimal.Parse(parts[16]);
+                    user.BulkOrder = bool.Parse(parts[17]);
+                    user.BulkOrderMaxValue = decimal.Parse(parts[18]);
+                    user.BulkViewPins = bool.Parse(parts[19]);
                 }
 
                 return user;

MAXData/Models/User.cs

@@ -54,5 +54,15 @@ namespace MAX.Models
         public bool CanReprintOffline { get; set; }
 
         public decimal OfflineReprintValue { get; set; }
+
+        public bool BulkExport { get; set; }
+
+        public decimal BulkExportMaxValue { get; set; }
+
+        public bool BulkOrder { get; set; }
+
+        public decimal BulkOrderMaxValue { get; set; }
+
+        public bool BulkViewPins { get; set; }
     }
 }

MAXData/Models/VendorEvent.cs

@@ -13,7 +13,8 @@ namespace MAX.Models
             Logout = 4,
             DownloadVoucher = 5,
             PrintVoucher = 6,
-            ViewVoucherPIN = 7
+            ViewVoucherPIN = 7,
+            ExportVoucher = 8
         }
 
         public int Id { get; set; }
@@ -29,5 +30,7 @@ namespace MAX.Models
         public DateTimeOffset EventDate { get; set; }
 
         public VendorEventType EventType { get; set; }
+
+        public bool Retry { get; set; }
     }
 }