From b1b78ac6aed722505d299c89cb546d86a08c03bf Mon Sep 17 00:00:00 2001 From: Michael Obernberger Date: Thu, 9 Jun 2022 17:52:06 +0200 Subject: [PATCH 1/2] Added RedeemToken to RedeemResult and CancelRedemptionRequest --- E-GUMA/Eguma.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/E-GUMA/Eguma.cs b/E-GUMA/Eguma.cs index 7c10596..70e8ee6 100644 --- a/E-GUMA/Eguma.cs +++ b/E-GUMA/Eguma.cs @@ -70,6 +70,9 @@ public class RedeemResult [DataMember(Name = "voucher_document_url")] public string VoucherDocumentUrl { get; set; } + + [DataMember(Name = "redeem_token")] + public string RedeemToken { get; set; } } [DataContract] @@ -77,6 +80,9 @@ public class CancelRedemptionRequest { [DataMember(Name = "amount_in_cents")] public int AmountInCents { get; set; } + + [DataMember(Name = "redeem_token")] + public int RedeemToken { get; set; } } [DataContract] From c4bd3ed819e71c050f6d5d3a876b0c4755feff8b Mon Sep 17 00:00:00 2001 From: Michael Obernberger Date: Fri, 10 Jun 2022 07:15:36 +0200 Subject: [PATCH 2/2] Send Redeem Token in Request Added new IO Fields to Example --- E-GUMA.Example/Form1.Designer.cs | 509 ++++++++++++++++++++----------- E-GUMA.Example/Form1.cs | 9 +- E-GUMA/Eguma.cs | 6 +- 3 files changed, 334 insertions(+), 190 deletions(-) diff --git a/E-GUMA.Example/Form1.Designer.cs b/E-GUMA.Example/Form1.Designer.cs index 6fde4f8..0701709 100644 --- a/E-GUMA.Example/Form1.Designer.cs +++ b/E-GUMA.Example/Form1.Designer.cs @@ -64,6 +64,8 @@ private void InitializeComponent() this.labelCancelRedemptionCodeValue = new System.Windows.Forms.Label(); this.label36 = new System.Windows.Forms.Label(); this.panel5 = new System.Windows.Forms.Panel(); + this.label38 = new System.Windows.Forms.Label(); + this.textBoxActivateFreeAmount = new System.Windows.Forms.TextBox(); this.labelDepotActivateAmount = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); this.buttonActivate = new System.Windows.Forms.Button(); @@ -110,8 +112,10 @@ private void InitializeComponent() this.label34 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.label35 = new System.Windows.Forms.Label(); - this.textBoxActivateFreeAmount = new System.Windows.Forms.TextBox(); - this.label38 = new System.Windows.Forms.Label(); + this.label39 = new System.Windows.Forms.Label(); + this.textBoxCancelRedemptionToken = new System.Windows.Forms.TextBox(); + this.label40 = new System.Windows.Forms.Label(); + this.labelRedeemToken = new System.Windows.Forms.Label(); this.panel4.SuspendLayout(); this.panel3.SuspendLayout(); this.panel2.SuspendLayout(); @@ -130,18 +134,20 @@ private void InitializeComponent() this.panel4.Controls.Add(this.linkLabel1); this.panel4.Controls.Add(this.textBoxCode); this.panel4.Controls.Add(this.label1); - this.panel4.Location = new System.Drawing.Point(12, 12); + this.panel4.Location = new System.Drawing.Point(18, 18); + this.panel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(605, 49); + this.panel4.Size = new System.Drawing.Size(908, 75); this.panel4.TabIndex = 26; // // linkLabel1 // this.linkLabel1.AutoSize = true; this.linkLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F); - this.linkLabel1.Location = new System.Drawing.Point(168, 13); + this.linkLabel1.Location = new System.Drawing.Point(252, 20); + this.linkLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(207, 24); + this.linkLabel1.Size = new System.Drawing.Size(320, 33); this.linkLabel1.TabIndex = 22; this.linkLabel1.TabStop = true; this.linkLabel1.Text = "voucher2mobile - Alias:"; @@ -150,9 +156,10 @@ private void InitializeComponent() // textBoxCode // this.textBoxCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxCode.Location = new System.Drawing.Point(384, 10); + this.textBoxCode.Location = new System.Drawing.Point(576, 15); + this.textBoxCode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.textBoxCode.Name = "textBoxCode"; - this.textBoxCode.Size = new System.Drawing.Size(205, 29); + this.textBoxCode.Size = new System.Drawing.Size(306, 40); this.textBoxCode.TabIndex = 3; this.textBoxCode.Text = "JWCP-P7QV-25S4"; // @@ -160,17 +167,19 @@ private void InitializeComponent() // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(13, 13); + this.label1.Location = new System.Drawing.Point(20, 20); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(162, 24); + this.label1.Size = new System.Drawing.Size(244, 33); this.label1.TabIndex = 21; this.label1.Text = "Voucher-Code or "; // // redeemButton // - this.redeemButton.Location = new System.Drawing.Point(13, 99); + this.redeemButton.Location = new System.Drawing.Point(20, 152); + this.redeemButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.redeemButton.Name = "redeemButton"; - this.redeemButton.Size = new System.Drawing.Size(79, 23); + this.redeemButton.Size = new System.Drawing.Size(118, 35); this.redeemButton.TabIndex = 2; this.redeemButton.Text = "OK"; this.redeemButton.UseVisualStyleBackColor = true; @@ -180,9 +189,10 @@ private void InitializeComponent() // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(11, 10); + this.label10.Location = new System.Drawing.Point(16, 15); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(78, 24); + this.label10.Size = new System.Drawing.Size(120, 33); this.label10.TabIndex = 20; this.label10.Text = "Balance"; // @@ -201,50 +211,56 @@ private void InitializeComponent() this.panel3.Controls.Add(this.label2); this.panel3.Controls.Add(this.label3); this.panel3.Controls.Add(this.labelMessageValue); - this.panel3.Location = new System.Drawing.Point(12, 67); + this.panel3.Location = new System.Drawing.Point(18, 103); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(207, 224); + this.panel3.Size = new System.Drawing.Size(310, 345); this.panel3.TabIndex = 25; // // labelCode // this.labelCode.AutoSize = true; - this.labelCode.Location = new System.Drawing.Point(90, 77); + this.labelCode.Location = new System.Drawing.Point(135, 118); + this.labelCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelCode.Name = "labelCode"; - this.labelCode.Size = new System.Drawing.Size(0, 13); + this.labelCode.Size = new System.Drawing.Size(0, 20); this.labelCode.TabIndex = 26; // // label22 // this.label22.AutoSize = true; - this.label22.Location = new System.Drawing.Point(13, 75); + this.label22.Location = new System.Drawing.Point(20, 115); + this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(35, 13); + this.label22.Size = new System.Drawing.Size(51, 20); this.label22.TabIndex = 25; this.label22.Text = "Code:"; // // labelTotalAmountValue // this.labelTotalAmountValue.AutoSize = true; - this.labelTotalAmountValue.Location = new System.Drawing.Point(90, 122); + this.labelTotalAmountValue.Location = new System.Drawing.Point(135, 188); + this.labelTotalAmountValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelTotalAmountValue.Name = "labelTotalAmountValue"; - this.labelTotalAmountValue.Size = new System.Drawing.Size(0, 13); + this.labelTotalAmountValue.Size = new System.Drawing.Size(0, 20); this.labelTotalAmountValue.TabIndex = 22; // // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(12, 122); + this.label20.Location = new System.Drawing.Point(18, 188); + this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(34, 13); + this.label20.Size = new System.Drawing.Size(48, 20); this.label20.TabIndex = 21; this.label20.Text = "Total:"; // // checkBalanceButton // - this.checkBalanceButton.Location = new System.Drawing.Point(12, 49); + this.checkBalanceButton.Location = new System.Drawing.Point(18, 75); + this.checkBalanceButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.checkBalanceButton.Name = "checkBalanceButton"; - this.checkBalanceButton.Size = new System.Drawing.Size(79, 23); + this.checkBalanceButton.Size = new System.Drawing.Size(118, 35); this.checkBalanceButton.TabIndex = 0; this.checkBalanceButton.Text = "OK"; this.checkBalanceButton.UseVisualStyleBackColor = true; @@ -253,53 +269,59 @@ private void InitializeComponent() // labelBalance // this.labelBalance.AutoSize = true; - this.labelBalance.Location = new System.Drawing.Point(12, 106); + this.labelBalance.Location = new System.Drawing.Point(18, 163); + this.labelBalance.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelBalance.Name = "labelBalance"; - this.labelBalance.Size = new System.Drawing.Size(49, 13); + this.labelBalance.Size = new System.Drawing.Size(71, 20); this.labelBalance.TabIndex = 5; this.labelBalance.Text = "Balance:"; // // labelBalanceValue // this.labelBalanceValue.AutoSize = true; - this.labelBalanceValue.Location = new System.Drawing.Point(91, 107); + this.labelBalanceValue.Location = new System.Drawing.Point(136, 165); + this.labelBalanceValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelBalanceValue.Name = "labelBalanceValue"; - this.labelBalanceValue.Size = new System.Drawing.Size(0, 13); + this.labelBalanceValue.Size = new System.Drawing.Size(0, 20); this.labelBalanceValue.TabIndex = 6; // // labelIsRedeemable // this.labelIsRedeemable.AutoSize = true; - this.labelIsRedeemable.Location = new System.Drawing.Point(91, 91); + this.labelIsRedeemable.Location = new System.Drawing.Point(136, 140); + this.labelIsRedeemable.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelIsRedeemable.Name = "labelIsRedeemable"; - this.labelIsRedeemable.Size = new System.Drawing.Size(0, 13); + this.labelIsRedeemable.Size = new System.Drawing.Size(0, 20); this.labelIsRedeemable.TabIndex = 10; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 138); + this.label2.Location = new System.Drawing.Point(18, 212); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(53, 13); + this.label2.Size = new System.Drawing.Size(78, 20); this.label2.TabIndex = 7; this.label2.Text = "Message:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 91); + this.label3.Location = new System.Drawing.Point(18, 140); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(70, 13); + this.label3.Size = new System.Drawing.Size(104, 20); this.label3.TabIndex = 9; this.label3.Text = "Redeemable:"; // // labelMessageValue // this.labelMessageValue.AutoSize = true; - this.labelMessageValue.Location = new System.Drawing.Point(91, 138); - this.labelMessageValue.MaximumSize = new System.Drawing.Size(100, 0); + this.labelMessageValue.Location = new System.Drawing.Point(136, 212); + this.labelMessageValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelMessageValue.MaximumSize = new System.Drawing.Size(150, 0); this.labelMessageValue.Name = "labelMessageValue"; - this.labelMessageValue.Size = new System.Drawing.Size(0, 13); + this.labelMessageValue.Size = new System.Drawing.Size(0, 20); this.labelMessageValue.TabIndex = 8; this.labelMessageValue.Click += new System.EventHandler(this.labelMessageValue_Click); // @@ -307,9 +329,10 @@ private void InitializeComponent() // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label9.Location = new System.Drawing.Point(12, 10); + this.label9.Location = new System.Drawing.Point(18, 15); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(83, 24); + this.label9.Size = new System.Drawing.Size(125, 33); this.label9.TabIndex = 19; this.label9.Text = "Redeem"; // @@ -317,6 +340,8 @@ private void InitializeComponent() // this.panel2.BackColor = System.Drawing.SystemColors.ActiveCaption; this.panel2.Controls.Add(this.labelRedeemCodeValue); + this.panel2.Controls.Add(this.labelRedeemToken); + this.panel2.Controls.Add(this.label39); this.panel2.Controls.Add(this.label25); this.panel2.Controls.Add(this.label9); this.panel2.Controls.Add(this.label4); @@ -324,83 +349,93 @@ private void InitializeComponent() this.panel2.Controls.Add(this.labelNewBalance); this.panel2.Controls.Add(this.textBoxAmountToRedeem); this.panel2.Controls.Add(this.label5); - this.panel2.Location = new System.Drawing.Point(225, 67); + this.panel2.Location = new System.Drawing.Point(338, 103); + this.panel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(206, 225); + this.panel2.Size = new System.Drawing.Size(309, 346); this.panel2.TabIndex = 24; // // labelRedeemCodeValue // this.labelRedeemCodeValue.AutoSize = true; - this.labelRedeemCodeValue.Location = new System.Drawing.Point(95, 159); + this.labelRedeemCodeValue.Location = new System.Drawing.Point(79, 277); + this.labelRedeemCodeValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelRedeemCodeValue.Name = "labelRedeemCodeValue"; - this.labelRedeemCodeValue.Size = new System.Drawing.Size(0, 13); + this.labelRedeemCodeValue.Size = new System.Drawing.Size(0, 20); this.labelRedeemCodeValue.TabIndex = 21; // // label25 // this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(13, 160); + this.label25.Location = new System.Drawing.Point(20, 277); + this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(35, 13); + this.label25.Size = new System.Drawing.Size(51, 20); this.label25.TabIndex = 20; this.label25.Text = "Code:"; // // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(13, 52); + this.label4.Location = new System.Drawing.Point(20, 80); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(46, 13); + this.label4.Size = new System.Drawing.Size(69, 20); this.label4.TabIndex = 12; this.label4.Text = "Amount:"; // // labelNewBalance // this.labelNewBalance.AutoSize = true; - this.labelNewBalance.Location = new System.Drawing.Point(92, 140); + this.labelNewBalance.Location = new System.Drawing.Point(138, 215); + this.labelNewBalance.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNewBalance.Name = "labelNewBalance"; - this.labelNewBalance.Size = new System.Drawing.Size(0, 13); + this.labelNewBalance.Size = new System.Drawing.Size(0, 20); this.labelNewBalance.TabIndex = 14; // // textBoxAmountToRedeem // - this.textBoxAmountToRedeem.Location = new System.Drawing.Point(16, 73); + this.textBoxAmountToRedeem.Location = new System.Drawing.Point(24, 112); + this.textBoxAmountToRedeem.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.textBoxAmountToRedeem.Name = "textBoxAmountToRedeem"; - this.textBoxAmountToRedeem.Size = new System.Drawing.Size(73, 20); + this.textBoxAmountToRedeem.Size = new System.Drawing.Size(108, 26); this.textBoxAmountToRedeem.TabIndex = 11; // // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(13, 140); + this.label5.Location = new System.Drawing.Point(20, 215); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(74, 13); + this.label5.Size = new System.Drawing.Size(106, 20); this.label5.TabIndex = 13; this.label5.Text = "New Balance:"; // // labelNewBalanceAfterCancelRedemption // this.labelNewBalanceAfterCancelRedemption.AutoSize = true; - this.labelNewBalanceAfterCancelRedemption.Location = new System.Drawing.Point(88, 128); + this.labelNewBalanceAfterCancelRedemption.Location = new System.Drawing.Point(134, 245); + this.labelNewBalanceAfterCancelRedemption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelNewBalanceAfterCancelRedemption.Name = "labelNewBalanceAfterCancelRedemption"; - this.labelNewBalanceAfterCancelRedemption.Size = new System.Drawing.Size(0, 13); + this.labelNewBalanceAfterCancelRedemption.Size = new System.Drawing.Size(0, 20); this.labelNewBalanceAfterCancelRedemption.TabIndex = 18; // // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(12, 128); + this.label8.Location = new System.Drawing.Point(20, 245); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(74, 13); + this.label8.Size = new System.Drawing.Size(106, 20); this.label8.TabIndex = 16; this.label8.Text = "New Balance:"; // // buttonCancelRedemption // - this.buttonCancelRedemption.Location = new System.Drawing.Point(12, 96); + this.buttonCancelRedemption.Location = new System.Drawing.Point(20, 196); + this.buttonCancelRedemption.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonCancelRedemption.Name = "buttonCancelRedemption"; - this.buttonCancelRedemption.Size = new System.Drawing.Size(76, 23); + this.buttonCancelRedemption.Size = new System.Drawing.Size(114, 35); this.buttonCancelRedemption.TabIndex = 16; this.buttonCancelRedemption.Text = "OK"; this.buttonCancelRedemption.UseVisualStyleBackColor = true; @@ -408,33 +443,38 @@ private void InitializeComponent() // // textBoxCancelRedemptionAmount // - this.textBoxCancelRedemptionAmount.Location = new System.Drawing.Point(15, 67); + this.textBoxCancelRedemptionAmount.Location = new System.Drawing.Point(22, 103); + this.textBoxCancelRedemptionAmount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.textBoxCancelRedemptionAmount.Name = "textBoxCancelRedemptionAmount"; - this.textBoxCancelRedemptionAmount.Size = new System.Drawing.Size(73, 20); + this.textBoxCancelRedemptionAmount.Size = new System.Drawing.Size(275, 26); this.textBoxCancelRedemptionAmount.TabIndex = 16; // // label7 // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label7.Location = new System.Drawing.Point(12, 10); + this.label7.Location = new System.Drawing.Point(18, 15); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(177, 24); + this.label7.Size = new System.Drawing.Size(271, 33); this.label7.TabIndex = 17; this.label7.Text = "Cancel Redemption"; // // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(12, 49); + this.label6.Location = new System.Drawing.Point(18, 75); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(46, 13); + this.label6.Size = new System.Drawing.Size(69, 20); this.label6.TabIndex = 16; this.label6.Text = "Amount:"; // // panel1 // this.panel1.BackColor = System.Drawing.SystemColors.ActiveCaption; + this.panel1.Controls.Add(this.textBoxCancelRedemptionToken); + this.panel1.Controls.Add(this.label40); this.panel1.Controls.Add(this.labelCancelRedemptionCodeValue); this.panel1.Controls.Add(this.label36); this.panel1.Controls.Add(this.labelNewBalanceAfterCancelRedemption); @@ -443,25 +483,28 @@ private void InitializeComponent() this.panel1.Controls.Add(this.textBoxCancelRedemptionAmount); this.panel1.Controls.Add(this.label7); this.panel1.Controls.Add(this.label6); - this.panel1.Location = new System.Drawing.Point(438, 67); + this.panel1.Location = new System.Drawing.Point(657, 103); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(211, 225); + this.panel1.Size = new System.Drawing.Size(316, 346); this.panel1.TabIndex = 23; // // labelCancelRedemptionCodeValue // this.labelCancelRedemptionCodeValue.AutoSize = true; - this.labelCancelRedemptionCodeValue.Location = new System.Drawing.Point(88, 148); + this.labelCancelRedemptionCodeValue.Location = new System.Drawing.Point(134, 276); + this.labelCancelRedemptionCodeValue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelCancelRedemptionCodeValue.Name = "labelCancelRedemptionCodeValue"; - this.labelCancelRedemptionCodeValue.Size = new System.Drawing.Size(0, 13); + this.labelCancelRedemptionCodeValue.Size = new System.Drawing.Size(0, 20); this.labelCancelRedemptionCodeValue.TabIndex = 22; // // label36 // this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(13, 148); + this.label36.Location = new System.Drawing.Point(22, 276); + this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(35, 13); + this.label36.Size = new System.Drawing.Size(51, 20); this.label36.TabIndex = 21; this.label36.Text = "Code:"; // @@ -474,33 +517,55 @@ private void InitializeComponent() this.panel5.Controls.Add(this.label13); this.panel5.Controls.Add(this.buttonActivate); this.panel5.Controls.Add(this.label11); - this.panel5.Location = new System.Drawing.Point(209, 374); + this.panel5.Location = new System.Drawing.Point(314, 575); + this.panel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(195, 224); + this.panel5.Size = new System.Drawing.Size(292, 345); this.panel5.TabIndex = 27; // + // label38 + // + this.label38.AutoSize = true; + this.label38.Location = new System.Drawing.Point(26, 86); + this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label38.Name = "label38"; + this.label38.Size = new System.Drawing.Size(102, 20); + this.label38.TabIndex = 24; + this.label38.Text = "FreeAmount:"; + // + // textBoxActivateFreeAmount + // + this.textBoxActivateFreeAmount.Location = new System.Drawing.Point(24, 112); + this.textBoxActivateFreeAmount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxActivateFreeAmount.Name = "textBoxActivateFreeAmount"; + this.textBoxActivateFreeAmount.Size = new System.Drawing.Size(108, 26); + this.textBoxActivateFreeAmount.TabIndex = 23; + // // labelDepotActivateAmount // this.labelDepotActivateAmount.AutoSize = true; - this.labelDepotActivateAmount.Location = new System.Drawing.Point(67, 128); + this.labelDepotActivateAmount.Location = new System.Drawing.Point(100, 197); + this.labelDepotActivateAmount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotActivateAmount.Name = "labelDepotActivateAmount"; - this.labelDepotActivateAmount.Size = new System.Drawing.Size(0, 13); + this.labelDepotActivateAmount.Size = new System.Drawing.Size(0, 20); this.labelDepotActivateAmount.TabIndex = 22; // // label13 // this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(17, 128); + this.label13.Location = new System.Drawing.Point(26, 197); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(46, 13); + this.label13.Size = new System.Drawing.Size(69, 20); this.label13.TabIndex = 21; this.label13.Text = "Amount:"; // // buttonActivate // - this.buttonActivate.Location = new System.Drawing.Point(16, 97); + this.buttonActivate.Location = new System.Drawing.Point(24, 149); + this.buttonActivate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonActivate.Name = "buttonActivate"; - this.buttonActivate.Size = new System.Drawing.Size(75, 23); + this.buttonActivate.Size = new System.Drawing.Size(112, 35); this.buttonActivate.TabIndex = 20; this.buttonActivate.Text = "OK"; this.buttonActivate.UseVisualStyleBackColor = true; @@ -510,9 +575,10 @@ private void InitializeComponent() // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label11.Location = new System.Drawing.Point(16, 11); + this.label11.Location = new System.Drawing.Point(24, 17); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(75, 24); + this.label11.Size = new System.Drawing.Size(119, 33); this.label11.TabIndex = 19; this.label11.Text = "Activate"; // @@ -521,17 +587,19 @@ private void InitializeComponent() this.panel6.BackColor = System.Drawing.SystemColors.ControlLight; this.panel6.Controls.Add(this.textBoxCodeDepot); this.panel6.Controls.Add(this.label12); - this.panel6.Location = new System.Drawing.Point(12, 316); + this.panel6.Location = new System.Drawing.Point(18, 486); + this.panel6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(586, 49); + this.panel6.Size = new System.Drawing.Size(879, 75); this.panel6.TabIndex = 27; // // textBoxCodeDepot // this.textBoxCodeDepot.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBoxCodeDepot.Location = new System.Drawing.Point(145, 11); + this.textBoxCodeDepot.Location = new System.Drawing.Point(218, 17); + this.textBoxCodeDepot.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.textBoxCodeDepot.Name = "textBoxCodeDepot"; - this.textBoxCodeDepot.Size = new System.Drawing.Size(274, 29); + this.textBoxCodeDepot.Size = new System.Drawing.Size(409, 40); this.textBoxCodeDepot.TabIndex = 3; this.textBoxCodeDepot.Text = "CDHE2JNT5LS9"; // @@ -539,9 +607,10 @@ private void InitializeComponent() // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label12.Location = new System.Drawing.Point(13, 13); + this.label12.Location = new System.Drawing.Point(20, 20); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(128, 24); + this.label12.Size = new System.Drawing.Size(197, 33); this.label12.TabIndex = 21; this.label12.Text = "Code (Depot):"; // @@ -552,33 +621,37 @@ private void InitializeComponent() this.panel7.Controls.Add(this.label15); this.panel7.Controls.Add(this.buttonDeactivate); this.panel7.Controls.Add(this.label16); - this.panel7.Location = new System.Drawing.Point(603, 374); + this.panel7.Location = new System.Drawing.Point(904, 575); + this.panel7.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel7.Name = "panel7"; - this.panel7.Size = new System.Drawing.Size(195, 224); + this.panel7.Size = new System.Drawing.Size(292, 345); this.panel7.TabIndex = 28; // // labelDepotDeactivateAmount // this.labelDepotDeactivateAmount.AutoSize = true; - this.labelDepotDeactivateAmount.Location = new System.Drawing.Point(67, 94); + this.labelDepotDeactivateAmount.Location = new System.Drawing.Point(100, 145); + this.labelDepotDeactivateAmount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotDeactivateAmount.Name = "labelDepotDeactivateAmount"; - this.labelDepotDeactivateAmount.Size = new System.Drawing.Size(0, 13); + this.labelDepotDeactivateAmount.Size = new System.Drawing.Size(0, 20); this.labelDepotDeactivateAmount.TabIndex = 22; // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(17, 94); + this.label15.Location = new System.Drawing.Point(26, 145); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(46, 13); + this.label15.Size = new System.Drawing.Size(69, 20); this.label15.TabIndex = 21; this.label15.Text = "Amount:"; // // buttonDeactivate // - this.buttonDeactivate.Location = new System.Drawing.Point(16, 57); + this.buttonDeactivate.Location = new System.Drawing.Point(24, 88); + this.buttonDeactivate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonDeactivate.Name = "buttonDeactivate"; - this.buttonDeactivate.Size = new System.Drawing.Size(75, 23); + this.buttonDeactivate.Size = new System.Drawing.Size(112, 35); this.buttonDeactivate.TabIndex = 20; this.buttonDeactivate.Text = "OK"; this.buttonDeactivate.UseVisualStyleBackColor = true; @@ -588,17 +661,19 @@ private void InitializeComponent() // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(16, 11); + this.label16.Location = new System.Drawing.Point(24, 17); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(96, 24); + this.label16.Size = new System.Drawing.Size(153, 33); this.label16.TabIndex = 19; this.label16.Text = "Deactivate"; // // buttonOpenActivateDlg // - this.buttonOpenActivateDlg.Location = new System.Drawing.Point(20, 105); + this.buttonOpenActivateDlg.Location = new System.Drawing.Point(30, 162); + this.buttonOpenActivateDlg.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonOpenActivateDlg.Name = "buttonOpenActivateDlg"; - this.buttonOpenActivateDlg.Size = new System.Drawing.Size(130, 34); + this.buttonOpenActivateDlg.Size = new System.Drawing.Size(195, 52); this.buttonOpenActivateDlg.TabIndex = 29; this.buttonOpenActivateDlg.Text = "Gutschein aktivieren"; this.buttonOpenActivateDlg.UseVisualStyleBackColor = true; @@ -606,9 +681,10 @@ private void InitializeComponent() // // buttonRedeemVoucher // - this.buttonRedeemVoucher.Location = new System.Drawing.Point(20, 55); + this.buttonRedeemVoucher.Location = new System.Drawing.Point(30, 85); + this.buttonRedeemVoucher.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonRedeemVoucher.Name = "buttonRedeemVoucher"; - this.buttonRedeemVoucher.Size = new System.Drawing.Size(130, 34); + this.buttonRedeemVoucher.Size = new System.Drawing.Size(195, 52); this.buttonRedeemVoucher.TabIndex = 30; this.buttonRedeemVoucher.Text = "Gutschein einlösen"; this.buttonRedeemVoucher.UseVisualStyleBackColor = true; @@ -620,18 +696,20 @@ private void InitializeComponent() this.panel8.Controls.Add(this.label14); this.panel8.Controls.Add(this.buttonRedeemVoucher); this.panel8.Controls.Add(this.buttonOpenActivateDlg); - this.panel8.Location = new System.Drawing.Point(655, 67); + this.panel8.Location = new System.Drawing.Point(982, 103); + this.panel8.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(185, 224); + this.panel8.Size = new System.Drawing.Size(278, 345); this.panel8.TabIndex = 31; // // label14 // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label14.Location = new System.Drawing.Point(17, 11); + this.label14.Location = new System.Drawing.Point(26, 17); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(149, 24); + this.label14.Size = new System.Drawing.Size(228, 33); this.label14.TabIndex = 21; this.label14.Text = "Mock-up dialogs"; // @@ -652,116 +730,130 @@ private void InitializeComponent() this.panel9.Controls.Add(this.label18); this.panel9.Controls.Add(this.buttonDepotVoucherStatus); this.panel9.Controls.Add(this.label19); - this.panel9.Location = new System.Drawing.Point(12, 374); + this.panel9.Location = new System.Drawing.Point(18, 575); + this.panel9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(195, 224); + this.panel9.Size = new System.Drawing.Size(292, 345); this.panel9.TabIndex = 29; // // labelDepotVoucherStatusFreeAmount // this.labelDepotVoucherStatusFreeAmount.AutoSize = true; - this.labelDepotVoucherStatusFreeAmount.Location = new System.Drawing.Point(83, 94); + this.labelDepotVoucherStatusFreeAmount.Location = new System.Drawing.Point(124, 145); + this.labelDepotVoucherStatusFreeAmount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherStatusFreeAmount.Name = "labelDepotVoucherStatusFreeAmount"; - this.labelDepotVoucherStatusFreeAmount.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherStatusFreeAmount.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherStatusFreeAmount.TabIndex = 33; // // label37 // this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(14, 94); + this.label37.Location = new System.Drawing.Point(21, 145); + this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label37.Name = "label37"; - this.label37.Size = new System.Drawing.Size(70, 13); + this.label37.Size = new System.Drawing.Size(106, 20); this.label37.TabIndex = 32; this.label37.Text = "Free Amount:"; // // labelDepotActivateStatusMessage // this.labelDepotActivateStatusMessage.AutoSize = true; - this.labelDepotActivateStatusMessage.Location = new System.Drawing.Point(14, 144); + this.labelDepotActivateStatusMessage.Location = new System.Drawing.Point(21, 222); + this.labelDepotActivateStatusMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotActivateStatusMessage.Name = "labelDepotActivateStatusMessage"; - this.labelDepotActivateStatusMessage.Size = new System.Drawing.Size(0, 13); + this.labelDepotActivateStatusMessage.Size = new System.Drawing.Size(0, 20); this.labelDepotActivateStatusMessage.TabIndex = 31; // // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(14, 146); + this.label17.Location = new System.Drawing.Point(21, 225); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(53, 13); + this.label17.Size = new System.Drawing.Size(78, 20); this.label17.TabIndex = 30; this.label17.Text = "Message:"; // // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(107, 148); + this.label24.Location = new System.Drawing.Point(160, 228); + this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(0, 13); + this.label24.Size = new System.Drawing.Size(0, 20); this.label24.TabIndex = 29; // // label23 // this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(14, 155); + this.label23.Location = new System.Drawing.Point(21, 238); + this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(0, 13); + this.label23.Size = new System.Drawing.Size(0, 20); this.label23.TabIndex = 28; // // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(14, 128); + this.label21.Location = new System.Drawing.Point(21, 197); + this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(93, 13); + this.label21.Size = new System.Drawing.Size(136, 20); this.label21.TabIndex = 27; this.label21.Text = "Can Be Activated:"; // // labelDepotVoucherStatusCanBeDeactivated // this.labelDepotVoucherStatusCanBeDeactivated.AutoSize = true; - this.labelDepotVoucherStatusCanBeDeactivated.Location = new System.Drawing.Point(122, 174); + this.labelDepotVoucherStatusCanBeDeactivated.Location = new System.Drawing.Point(183, 268); + this.labelDepotVoucherStatusCanBeDeactivated.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherStatusCanBeDeactivated.Name = "labelDepotVoucherStatusCanBeDeactivated"; - this.labelDepotVoucherStatusCanBeDeactivated.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherStatusCanBeDeactivated.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherStatusCanBeDeactivated.TabIndex = 26; // // labelDepotVoucherStatusCanBeActivated // this.labelDepotVoucherStatusCanBeActivated.AutoSize = true; - this.labelDepotVoucherStatusCanBeActivated.Location = new System.Drawing.Point(109, 130); + this.labelDepotVoucherStatusCanBeActivated.Location = new System.Drawing.Point(164, 200); + this.labelDepotVoucherStatusCanBeActivated.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherStatusCanBeActivated.Name = "labelDepotVoucherStatusCanBeActivated"; - this.labelDepotVoucherStatusCanBeActivated.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherStatusCanBeActivated.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherStatusCanBeActivated.TabIndex = 25; // // labelDepotVouherStatusInDepot // this.labelDepotVouherStatusInDepot.AutoSize = true; - this.labelDepotVouherStatusInDepot.Location = new System.Drawing.Point(66, 132); + this.labelDepotVouherStatusInDepot.Location = new System.Drawing.Point(99, 203); + this.labelDepotVouherStatusInDepot.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVouherStatusInDepot.Name = "labelDepotVouherStatusInDepot"; - this.labelDepotVouherStatusInDepot.Size = new System.Drawing.Size(0, 13); + this.labelDepotVouherStatusInDepot.Size = new System.Drawing.Size(0, 20); this.labelDepotVouherStatusInDepot.TabIndex = 24; // // labelDepotVoucherStatusAmount // this.labelDepotVoucherStatusAmount.AutoSize = true; - this.labelDepotVoucherStatusAmount.Location = new System.Drawing.Point(67, 112); + this.labelDepotVoucherStatusAmount.Location = new System.Drawing.Point(100, 172); + this.labelDepotVoucherStatusAmount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherStatusAmount.Name = "labelDepotVoucherStatusAmount"; - this.labelDepotVoucherStatusAmount.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherStatusAmount.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherStatusAmount.TabIndex = 22; // // label18 // this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(14, 112); + this.label18.Location = new System.Drawing.Point(21, 172); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(46, 13); + this.label18.Size = new System.Drawing.Size(69, 20); this.label18.TabIndex = 21; this.label18.Text = "Amount:"; // // buttonDepotVoucherStatus // - this.buttonDepotVoucherStatus.Location = new System.Drawing.Point(16, 57); + this.buttonDepotVoucherStatus.Location = new System.Drawing.Point(24, 88); + this.buttonDepotVoucherStatus.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonDepotVoucherStatus.Name = "buttonDepotVoucherStatus"; - this.buttonDepotVoucherStatus.Size = new System.Drawing.Size(75, 23); + this.buttonDepotVoucherStatus.Size = new System.Drawing.Size(112, 35); this.buttonDepotVoucherStatus.TabIndex = 20; this.buttonDepotVoucherStatus.Text = "OK"; this.buttonDepotVoucherStatus.UseVisualStyleBackColor = true; @@ -771,9 +863,10 @@ private void InitializeComponent() // this.label19.AutoSize = true; this.label19.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label19.Location = new System.Drawing.Point(16, 11); + this.label19.Location = new System.Drawing.Point(24, 17); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(130, 24); + this.label19.Size = new System.Drawing.Size(209, 33); this.label19.TabIndex = 19; this.label19.Text = "Activate Status"; // @@ -794,115 +887,129 @@ private void InitializeComponent() this.panel10.Controls.Add(this.label34); this.panel10.Controls.Add(this.button1); this.panel10.Controls.Add(this.label35); - this.panel10.Location = new System.Drawing.Point(406, 374); + this.panel10.Location = new System.Drawing.Point(609, 575); + this.panel10.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(195, 224); + this.panel10.Size = new System.Drawing.Size(292, 345); this.panel10.TabIndex = 32; // // labelDepotVoucherDeactivateStatusCanBeDeactivated // this.labelDepotVoucherDeactivateStatusCanBeDeactivated.AutoSize = true; - this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Location = new System.Drawing.Point(118, 110); + this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Location = new System.Drawing.Point(177, 169); + this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Name = "labelDepotVoucherDeactivateStatusCanBeDeactivated"; - this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherDeactivateStatusCanBeDeactivated.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherDeactivateStatusCanBeDeactivated.TabIndex = 33; // // labelDepotVoucherDeactivateStatusAmount // this.labelDepotVoucherDeactivateStatusAmount.AutoSize = true; - this.labelDepotVoucherDeactivateStatusAmount.Location = new System.Drawing.Point(60, 95); + this.labelDepotVoucherDeactivateStatusAmount.Location = new System.Drawing.Point(90, 146); + this.labelDepotVoucherDeactivateStatusAmount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherDeactivateStatusAmount.Name = "labelDepotVoucherDeactivateStatusAmount"; - this.labelDepotVoucherDeactivateStatusAmount.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherDeactivateStatusAmount.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherDeactivateStatusAmount.TabIndex = 32; // // labelDepotVoucherDeactivateStatusMessage // this.labelDepotVoucherDeactivateStatusMessage.AutoSize = true; - this.labelDepotVoucherDeactivateStatusMessage.Location = new System.Drawing.Point(14, 144); + this.labelDepotVoucherDeactivateStatusMessage.Location = new System.Drawing.Point(21, 222); + this.labelDepotVoucherDeactivateStatusMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labelDepotVoucherDeactivateStatusMessage.Name = "labelDepotVoucherDeactivateStatusMessage"; - this.labelDepotVoucherDeactivateStatusMessage.Size = new System.Drawing.Size(0, 13); + this.labelDepotVoucherDeactivateStatusMessage.Size = new System.Drawing.Size(0, 20); this.labelDepotVoucherDeactivateStatusMessage.TabIndex = 31; // // label26 // this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(14, 128); + this.label26.Location = new System.Drawing.Point(21, 197); + this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(53, 13); + this.label26.Size = new System.Drawing.Size(78, 20); this.label26.TabIndex = 30; this.label26.Text = "Message:"; // // label27 // this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(107, 130); + this.label27.Location = new System.Drawing.Point(160, 200); + this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(0, 13); + this.label27.Size = new System.Drawing.Size(0, 20); this.label27.TabIndex = 29; // // label28 // this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(14, 155); + this.label28.Location = new System.Drawing.Point(21, 238); + this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(0, 13); + this.label28.Size = new System.Drawing.Size(0, 20); this.label28.TabIndex = 28; // // label29 // this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(14, 110); + this.label29.Location = new System.Drawing.Point(21, 169); + this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(106, 13); + this.label29.Size = new System.Drawing.Size(155, 20); this.label29.TabIndex = 27; this.label29.Text = "Can Be Deactivated:"; // // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(122, 156); + this.label30.Location = new System.Drawing.Point(183, 240); + this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(0, 13); + this.label30.Size = new System.Drawing.Size(0, 20); this.label30.TabIndex = 26; // // label31 // this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(109, 112); + this.label31.Location = new System.Drawing.Point(164, 172); + this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(0, 13); + this.label31.Size = new System.Drawing.Size(0, 20); this.label31.TabIndex = 25; // // label32 // this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(66, 114); + this.label32.Location = new System.Drawing.Point(99, 175); + this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(0, 13); + this.label32.Size = new System.Drawing.Size(0, 20); this.label32.TabIndex = 24; // // label33 // this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(67, 94); + this.label33.Location = new System.Drawing.Point(100, 145); + this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(0, 13); + this.label33.Size = new System.Drawing.Size(0, 20); this.label33.TabIndex = 22; // // label34 // this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(14, 94); + this.label34.Location = new System.Drawing.Point(21, 145); + this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label34.Name = "label34"; - this.label34.Size = new System.Drawing.Size(46, 13); + this.label34.Size = new System.Drawing.Size(69, 20); this.label34.TabIndex = 21; this.label34.Text = "Amount:"; // // button1 // - this.button1.Location = new System.Drawing.Point(16, 57); + this.button1.Location = new System.Drawing.Point(24, 88); + this.button1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(112, 35); this.button1.TabIndex = 20; this.button1.Text = "OK"; this.button1.UseVisualStyleBackColor = true; @@ -912,33 +1019,59 @@ private void InitializeComponent() // this.label35.AutoSize = true; this.label35.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label35.Location = new System.Drawing.Point(16, 11); + this.label35.Location = new System.Drawing.Point(24, 17); + this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(151, 24); + this.label35.Size = new System.Drawing.Size(243, 33); this.label35.TabIndex = 19; this.label35.Text = "Deactivate Status"; // - // textBoxActivateFreeAmount - // - this.textBoxActivateFreeAmount.Location = new System.Drawing.Point(16, 73); - this.textBoxActivateFreeAmount.Name = "textBoxActivateFreeAmount"; - this.textBoxActivateFreeAmount.Size = new System.Drawing.Size(73, 20); - this.textBoxActivateFreeAmount.TabIndex = 23; - // - // label38 - // - this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(17, 56); - this.label38.Name = "label38"; - this.label38.Size = new System.Drawing.Size(67, 13); - this.label38.TabIndex = 24; - this.label38.Text = "FreeAmount:"; + // label39 + // + this.label39.AutoSize = true; + this.label39.Location = new System.Drawing.Point(20, 245); + this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label39.Name = "label39"; + this.label39.Size = new System.Drawing.Size(122, 20); + this.label39.TabIndex = 22; + this.label39.Text = "Redeem Token:"; + // + // textBoxCancelRedemptionToken + // + this.textBoxCancelRedemptionToken.Location = new System.Drawing.Point(22, 165); + this.textBoxCancelRedemptionToken.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.textBoxCancelRedemptionToken.Name = "textBoxCancelRedemptionToken"; + this.textBoxCancelRedemptionToken.Size = new System.Drawing.Size(275, 26); + this.textBoxCancelRedemptionToken.TabIndex = 23; + // + // label40 + // + this.label40.AutoSize = true; + this.label40.Location = new System.Drawing.Point(18, 137); + this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(122, 20); + this.label40.TabIndex = 24; + this.label40.Text = "Redeem Token:"; + // + // labelRedeemToken + // + this.labelRedeemToken.AutoEllipsis = true; + this.labelRedeemToken.Cursor = System.Windows.Forms.Cursors.Hand; + this.labelRedeemToken.Location = new System.Drawing.Point(150, 245); + this.labelRedeemToken.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelRedeemToken.MaximumSize = new System.Drawing.Size(120, 24); + this.labelRedeemToken.MinimumSize = new System.Drawing.Size(120, 24); + this.labelRedeemToken.Name = "labelRedeemToken"; + this.labelRedeemToken.Size = new System.Drawing.Size(120, 24); + this.labelRedeemToken.TabIndex = 23; + this.labelRedeemToken.Click += new System.EventHandler(this.labelRedeemToken_Click); // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(860, 608); + this.ClientSize = new System.Drawing.Size(1290, 935); this.Controls.Add(this.panel10); this.Controls.Add(this.panel9); this.Controls.Add(this.panel8); @@ -949,6 +1082,7 @@ private void InitializeComponent() this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "Form1"; this.Text = "E-GUMA API (v1) Example"; this.panel4.ResumeLayout(false); @@ -1060,7 +1194,10 @@ private void InitializeComponent() private System.Windows.Forms.Label labelDepotVoucherStatusFreeAmount; private System.Windows.Forms.Label label37; private System.Windows.Forms.Label label38; - private System.Windows.Forms.TextBox textBoxActivateFreeAmount; - + private System.Windows.Forms.TextBox textBoxActivateFreeAmount; + private System.Windows.Forms.Label label39; + private System.Windows.Forms.TextBox textBoxCancelRedemptionToken; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.Label labelRedeemToken; } } \ No newline at end of file diff --git a/E-GUMA.Example/Form1.cs b/E-GUMA.Example/Form1.cs index 270b76a..6cbb76b 100644 --- a/E-GUMA.Example/Form1.cs +++ b/E-GUMA.Example/Form1.cs @@ -61,6 +61,8 @@ private void redeemButton_Click(object sender, EventArgs e) var result = CreateEguma().Redeem(textBoxCode.Text, amountInCents); labelNewBalance.Text = Eguma.ConvertCentsToFrancs(result.BalanceInCents).ToString("F2"); labelRedeemCodeValue.Text = result.Code; + labelRedeemToken.Text = result.RedeemToken; + textBoxCancelRedemptionToken.Text = result.RedeemToken; } catch (Exception exception) @@ -75,7 +77,7 @@ private void buttonCancelRedemption_Click(object sender, EventArgs e) { var amountInCents = Eguma.ConvertFrancsToCents(decimal.Parse(textBoxCancelRedemptionAmount.Text)); - var result = CreateEguma().CancelRedemption(textBoxCode.Text, amountInCents); + var result = CreateEguma().CancelRedemption(textBoxCode.Text, amountInCents, textBoxCancelRedemptionToken.Text); labelNewBalanceAfterCancelRedemption.Text = Eguma.ConvertCentsToFrancs(result.BalanceInCents).ToString("F2"); labelCancelRedemptionCodeValue.Text = result.Code; } @@ -171,5 +173,10 @@ private void labelMessageValue_Click(object sender, EventArgs e) { MessageBox.Show(labelMessageValue.Text); } + + private void labelRedeemToken_Click(object sender, EventArgs e) + { + Clipboard.SetText(labelRedeemToken.Text); + } } } diff --git a/E-GUMA/Eguma.cs b/E-GUMA/Eguma.cs index 70e8ee6..11dff97 100644 --- a/E-GUMA/Eguma.cs +++ b/E-GUMA/Eguma.cs @@ -82,7 +82,7 @@ public class CancelRedemptionRequest public int AmountInCents { get; set; } [DataMember(Name = "redeem_token")] - public int RedeemToken { get; set; } + public string RedeemToken { get; set; } } [DataContract] @@ -246,7 +246,7 @@ public RedeemResult Redeem(string voucherCode, int amountInCents) } } - public CancelRedemptionResult CancelRedemption(string voucherCode, int amountInCents) + public CancelRedemptionResult CancelRedemption(string voucherCode, int amountInCents, string redeemToken) { using (var client = CreateWebClient()) { @@ -258,7 +258,7 @@ public CancelRedemptionResult CancelRedemption(string voucherCode, int amountInC try { var resultAsJsonString = client.UploadString(url, JSONSerializer.Serialize( - new CancelRedemptionRequest { AmountInCents = amountInCents })); + new CancelRedemptionRequest { AmountInCents = amountInCents, RedeemToken = redeemToken })); return JSONSerializer.DeSerialize(resultAsJsonString);