diff --git a/Omise.Examples/Example.cs b/Omise.Examples/Example.cs index c4bde711..056b7d76 100644 --- a/Omise.Examples/Example.cs +++ b/Omise.Examples/Example.cs @@ -85,7 +85,7 @@ public async Task RetrieveSourceTrueMoney() Amount = 2000, Currency = "thb", Type = OffsiteTypes.TrueMoney, - PhoneNumber = "0812345678" + MobileNumber = "0812345678" }); } diff --git a/Omise.Examples/Examples/Balances.cs b/Omise.Examples/Examples/Balances.cs index 6276897c..f0e670ee 100644 --- a/Omise.Examples/Examples/Balances.cs +++ b/Omise.Examples/Examples/Balances.cs @@ -8,7 +8,7 @@ public class Balances : Example public async Task Retrieve__Retrieve() { var balance = await Client.Balance.Get(); - Console.WriteLine($"available balance: {balance.Available}"); + Console.WriteLine($"available balance: {balance.Transferable}"); Console.WriteLine($"total balance: {balance.Total}"); } } diff --git a/Omise.Examples/Examples/Charges.cs b/Omise.Examples/Examples/Charges.cs index 69a871bc..5e06c460 100644 --- a/Omise.Examples/Examples/Charges.cs +++ b/Omise.Examples/Examples/Charges.cs @@ -191,8 +191,6 @@ public async Task Create__Create_With_Source_InternetBanking() { Amount = 2000, Currency = "thb", - Offsite = OffsiteTypes.InternetBankingBAY, - Flow = FlowTypes.Redirect, Source = source, ReturnUri = "https://www.omise.co/", Metadata = new Dictionary @@ -262,8 +260,6 @@ public async Task Create__Create_With_Source_BillPayment() { Amount = 2000, Currency = "thb", - Offsite = OffsiteTypes.BillPaymentTescoLotus, - Flow = FlowTypes.Offline, Source = source }); @@ -280,8 +276,6 @@ public async Task Create__Create_With_Source_RabbitLinepay() { Amount = 2000, Currency = "thb", - Offsite = OffsiteTypes.RabbitLinepay, - Flow = FlowTypes.Redirect, Source = source }); @@ -297,8 +291,6 @@ public async Task Create__Create_With_Source_WeChatPay() { Amount = 2000, Currency = "thb", - Offsite = OffsiteTypes.WeChatPay, - Flow = FlowTypes.Redirect, Source = source }); diff --git a/Omise.Examples/Examples/PaymentSources.cs b/Omise.Examples/Examples/PaymentSources.cs index 82e5d9d5..b67c7759 100644 --- a/Omise.Examples/Examples/PaymentSources.cs +++ b/Omise.Examples/Examples/PaymentSources.cs @@ -123,7 +123,7 @@ public async Task Create__Create_TrueMoney() Amount = 2000, Currency = "thb", Type = OffsiteTypes.TrueMoney, - PhoneNumber = "0812345678" + MobileNumber = "0812345678" }); Console.WriteLine($"created source: {source.Id}"); diff --git a/Omise.Examples/Examples/Transfers.cs b/Omise.Examples/Examples/Transfers.cs index 75cfa3ad..f16d8e25 100644 --- a/Omise.Examples/Examples/Transfers.cs +++ b/Omise.Examples/Examples/Transfers.cs @@ -56,29 +56,6 @@ public async Task Retrieve__Retrieve() Console.WriteLine($"transfer amount: {transfer.Amount}"); } - public async Task Update__Update() - { - var transferId = ExampleInfo.TRANSFER_ID; // "trsf_test_560ph0660cgiag1xjeh"; - var transfer = await Client.Transfers.Update(transferId, new UpdateTransferRequest - { - Amount = 733137 - }); - - Console.WriteLine($"updated transfer: {transfer.Id}"); - } - - public async Task Update__Update_With_Metadata() - { - var transferId = ExampleInfo.TRANSFER_ID; // "trsf_test_560ph0660cgiag1xjeh"; - var transfer = await Client.Transfers.Update(transferId, new UpdateTransferRequest - { - Amount = 733137, - Metadata = new Dictionary { { "color", "red" } } - }); - - Console.WriteLine($"updated transfer: {transfer.Id}"); - } - public async Task Destroy__Destroy() { var transfer = RetrieveTransfer(); diff --git a/Omise.Tests/ClientTest.cs b/Omise.Tests/ClientTest.cs index 9b37e2dd..3cb7c75c 100644 --- a/Omise.Tests/ClientTest.cs +++ b/Omise.Tests/ClientTest.cs @@ -1,13 +1,13 @@ using System; using NUnit.Framework; -namespace Omise.Tests +namespace Omise.Tests { [TestFixture] - public class ClientTest : OmiseTest + public class ClientTest : OmiseTest { [Test] - public void TestCtor() + public void TestCtor() { var pkey = "pkey_test_123"; var skey = "skey_test_123"; @@ -23,44 +23,43 @@ public void TestCtor() } [Test] - public void TestAPIVersion() + public void TestAPIVersion() { var client = new Client("pkey_test_123", "skey_test_123"); - client.APIVersion = "new-shiny-version"; - Assert.AreEqual("new-shiny-version", client.APIVersion); - Assert.AreEqual("new-shiny-version", ((Requester)client.Requester).APIVersion); + Assert.AreEqual("2019-05-29", client.APIVersion); + Assert.AreEqual("2019-05-29", ((Requester)client.Requester).APIVersion); } [Test] - public void TestResources() + public void TestResources() { var client = new Client(DummyCredentials); var resources = new object[] { client.Account, - client.Balance, - client.Capability, - client.Charge("chrg_test_4yq7duw15p9hdrjp8oq"), + client.Balance, + client.Capability, + client.Charge("chrg_test_4yq7duw15p9hdrjp8oq"), client.Charges, - client.Customer("cust_test_4yq6txdpfadhbaqnwp3"), - client.Customers, + client.Customer("cust_test_4yq6txdpfadhbaqnwp3"), + client.Customers, client.Disputes, client.Events, client.Occurrences, - client.Recipient("recp_test_57po4c5obpi7rrxhtyl"), - client.Recipients, - client.Refunds, - client.Schedule("schd_test_57ze0f4rbugx2jjlg4y"), - client.Schedules, + client.Recipient("recp_test_57po4c5obpi7rrxhtyl"), + client.Recipients, + client.Refunds, + client.Schedule("schd_test_57ze0f4rbugx2jjlg4y"), + client.Schedules, client.Tokens, client.Transactions, client.Transfers, }; - foreach (var resource in resources) + foreach (var resource in resources) { Assert.IsNotNull(resource); - } + } } } } diff --git a/Omise.Tests/RealNetworkTest.cs b/Omise.Tests/RealNetworkTest.cs index 961c3019..c149610d 100644 --- a/Omise.Tests/RealNetworkTest.cs +++ b/Omise.Tests/RealNetworkTest.cs @@ -6,18 +6,24 @@ using System; using System.Threading.Tasks; -namespace Omise.Tests +namespace Omise.Tests.ManualTesting { [TestFixture, Explicit("code provided for manual testing only.")] public class RealNetworkTest : OmiseTest { - const string PublicKey = "pkey_test_replaceme"; - const string SecretKey = "skey_test_replaceme"; + const string PublicKey = "pkey"; + const string SecretKey = "skey"; + string cardToken = ""; + string cardToken2 = ""; + string chargeId = ""; + string recipientId = ""; + string customerId = ""; + string transferId = ""; + readonly Client client = new Client(pkey: PublicKey, skey: SecretKey, env: Environments.Staging); - [Test] - public async Task TestRealCharge() + [Test, Order(1)] + public async Task Create_Token_Full_Request() { - var client = buildTestClient(); var token = await client.Tokens.Create(new CreateTokenRequest { Name = "Omise Co., Ltd", @@ -25,58 +31,342 @@ public async Task TestRealCharge() SecurityCode = "123", ExpirationMonth = 10, ExpirationYear = 2029, + City = "City", + Country = "TH", + Email = "test@gmail.com", + PhoneNumber = "0745123498", + PostalCode = "18321", + State = "State", + Street1 = "Street1", + Street2 = "Street2" }); - WriteLine($"created token: ${token.Id}"); + cardToken = token.Id; + Console.WriteLine($"created token: {token.Id}"); + } + + [Test, Order(2)] + public async Task Create_Token_Min_Request() + { + var token = await client.Tokens.Create(new CreateTokenRequest + { + Number = "4242424242424242", + SecurityCode = "123", + ExpirationMonth = 10, + ExpirationYear = 2029, + Name = "Name" + }); + cardToken2 = token.Id; + Console.WriteLine($"created token: {token.Id}"); + } - var charge = await client.Charges.Create(new CreateChargeRequest + [Test, Order(3)] + public async Task Create_Source_Full_Request() + { + var source = await client.Sources.Create(new CreatePaymentSourceRequest { Amount = 2000, - Currency = "usd", - Card = token.Id, + Barcode = "Barcode", + Billing = new Billing() { City = "City", Country = "TH", PostalCode = "18321", State = "State", Street1 = "Streets1", Street2 = "Street2" }, + Currency = "THB", + Email = "test@gmail.com", + Flow = FlowTypes.Redirect, + Ip = "10.0.0.2", + InstallmentTerm = "3", + Items = new List { new Item { Amount = 2000, Brand = "TestBrand", Sku = "Sku", Category = "Category", ImageUri = "https://www.opn.ooo/", ItemUri = "https://www.opn.ooo/", Name = "Name", Quantity = 4, } }, + MobileNumber = "0745123498", + Name = "Name", + PromotionCode = "code", + Shipping = new Shipping() { City = "City", Country = "TH", PostalCode = "18321", State = "State", Street1 = "Streets1", Street2 = "Street2" }, + StoreId = "storeId", + StoreName = "storeName", + TerminalId = "terminalId", + Type = OffsiteTypes.PromptPay, + Bank = "bank" }); - WriteLine($"created charge: ${charge.Id}"); + Console.WriteLine($"created source: {source.Id}"); + } - charge = await client.Charges.Update(charge.Id, new UpdateChargeRequest + [Test, Order(4)] + public async Task Create_Source_Min_Request() + { + var source = await client.Sources.Create(new CreatePaymentSourceRequest { - Description = "TestRealCharge", - Metadata = new Dictionary { - { "test_date", DateTime.UtcNow.ToString() } + Currency = "THB", + Type = OffsiteTypes.PromptPay, + }); + Console.WriteLine($"created source: {source.Id}"); + } + + [Test, Order(5)] + public async Task Create_Charge_Full_Request_With_Token_Card() + { + + var charge = await client.Charges.Create(new CreateChargeRequest() + { + Amount = 2000, + Currency = "thb", + AuthorizationType = AuthTypes.FinalAuth, + ReturnUri = "https://www.example.com", + Capture = true, + Card = cardToken, + Description = "Description", + ExpiresAt = DateTime.Now.AddMinutes(10), + Ip = "10.0.0.2", + Metadata = new Dictionary + { + { "order_id", "123" } + }, + TransactionIndicator = "MIT", + ZeroInterestInstallments = true, + WebhookEndpoints = new string[] { "https://webhook.site/123" }, + PlatformFee = new PlatformFeeRequest() + { + Fixed = 0, + Percentage = 0, } }); - WriteLine($"updated charge: ${charge.Id}"); + + Console.WriteLine($"created charge: {charge.Id}"); } + [Test, Order(6)] + public async Task Create_Charge_Min_Request_With_Card_Token() + { - [Test] - public async Task TestGettingUsedToken() + var charge = await client.Charges.Create(new CreateChargeRequest() + { + Amount = 2000, + Currency = "thb", + AuthorizationType = AuthTypes.FinalAuth, + Card = cardToken2 + }); + chargeId = charge.Id; + Console.WriteLine($"created charge: {charge.Id}"); + + } + public async Task Create_Charge_Full_Request_With_Source() + { + + var charge = await client.Charges.Create(new CreateChargeRequest() + { + Amount = 2000, + Currency = "thb", + AuthorizationType = AuthTypes.FinalAuth, + ReturnUri = "https://www.example.com", + Capture = true, + Source = new PaymentSource + { + Amount = 2000, + Barcode = "Barcode", + Currency = "THB", + Email = "test@gmail.com", + Flow = FlowTypes.Redirect, + Ip = "10.0.0.2", + StoreId = "storeId", + StoreName = "storeName", + TerminalId = "terminalId", + Type = OffsiteTypes.PromptPay, + Bank = "bank" + }, + Description = "Description", + ExpiresAt = DateTime.Now.AddMinutes(10), + Ip = "10.0.0.2", + Metadata = new Dictionary + { + { "order_id", "123" } + }, + TransactionIndicator = "MIT", + ZeroInterestInstallments = true, + WebhookEndpoints = new string[] { "https://webhook.site/123" }, + }); + + Console.WriteLine($"created charge: {charge.Id}"); + } + [Test, Order(7)] + public async Task Create_Refund_Full_Params() + { + + var refund = await client.Charge(chargeId).Refunds.Create(new CreateRefundRequest + { + Amount = 2000, + Metadata = new Dictionary + { + { "order_id", "123" } + }, + Void = true + }); + + Console.WriteLine($"created refund: {refund.Id}"); + + } + [Test, Order(7)] + public async Task Create_Recipient_Full_Params() + { + + var recipient = await client.Recipients.Create(new CreateRecipientRequest + { + Name = "John Doe", + Email = "john.doe@example.com", + Description = "John Doe (user: 30)", + Type = RecipientType.Individual, + BankAccount = new BankAccountRequest + { + Brand = "kbank", + Number = "7777777777", + Name = "Dohn Joe", + }, + }); + recipientId = recipient.Id; + Console.WriteLine($"created recipient: {recipient.Id}"); + + } + [Test, Order(8)] + public async Task Create_Transfer_Full_Params() + { + + var transfer = await client.Transfers.Create(new CreateTransferRequest + { + Amount = 4000, + FailFast = false, + IdempKey = Guid.NewGuid().ToString(), + Metadata = new Dictionary + { + { "order_id", "123" } + }, + Recipient = recipientId, + SplitTransfer = false + + }); + transferId = transfer.Id; + Console.WriteLine($"created transfer: {transfer.Id}"); + + } + [Test, Order(9)] + public async Task Create_Customer_No_Card() + { + + var customer = await client.Customers.Create(new CreateCustomerRequest + { + Email = "john.doe@example.com", + Description = "John Doe (id: 30)", + Metadata = new Dictionary + { + { "user_id", 30 } + }, + }); + + Console.WriteLine($"created customer: {customer.Id}"); + + } + [Test, Order(10)] + public async Task Create_Customer_With_Card() { - var client = buildTestClient(); var token = await client.Tokens.Create(new CreateTokenRequest { - Name = "Omise Co., Ltd.", Number = "4242424242424242", SecurityCode = "123", ExpirationMonth = 10, ExpirationYear = 2029, + Name = "Name" + }); + var customer = await client.Customers.Create(new CreateCustomerRequest + { + Email = "john.doe@example.com", + Description = "John Doe (id: 30)", + Metadata = new Dictionary + { + { "user_id", 30 } + }, + Card = token.Id }); - WriteLine($"created token: {token.Id}"); + customerId = customer.Id; + Console.WriteLine($"created customer: {customer.Id}"); - token = await client.Tokens.Get(token.Id); - WriteLine($"retrieved token: {token.Id}"); + } + [Test, Order(11)] + public async Task Create_Charge_Full_Request_With_Customer() + { - var customer = await client.Customers.Create(new CreateCustomerRequest + var charge = await client.Charges.Create(new CreateChargeRequest() { - Email = "test@omise.co", - Card = token.Id, + Amount = 2000, + Currency = "thb", + AuthorizationType = AuthTypes.FinalAuth, + ReturnUri = "https://www.example.com", + Capture = true, + Customer = customerId, + Description = "Description", + ExpiresAt = DateTime.Now.AddMinutes(10), + Ip = "10.0.0.2", + Metadata = new Dictionary + { + { "order_id", "123" } + }, + TransactionIndicator = "MIT", + ZeroInterestInstallments = true, + WebhookEndpoints = new string[] { "https://webhook.site/123" }, }); - WriteLine($"created customer: {customer.Id}"); - token = await client.Tokens.Get(token.Id); - WriteLine($"retrieved token again: {token.Id}"); + Console.WriteLine($"created charge: {charge.Id}"); } + [Test, Order(13)] + public async Task Get_disputes_based_on_status() + { + + var resource = client.Disputes.ClosedDisputes; + var closedDisputes = await resource.GetList(order: Ordering.ReverseChronological); + Console.WriteLine($"closed disputes: {closedDisputes.Total}"); + resource = client.Disputes.OpenDisputes; + var openDisputes = await resource.GetList(order: Ordering.ReverseChronological); + Console.WriteLine($"open disputes: {openDisputes.Total}"); + + } + [Test, Order(14)] + public async Task Create_link() + { + + var link = await client.Links.Create(new CreateLinkRequest + { + Amount = 2000, + Currency = "thb", + Title = "that shirt.", + Description = "that shirt.", + Multiple = false + }); + + Console.WriteLine($"payment link: {link.PaymentURI}"); - Client buildTestClient() + } + [Test, Order(15)] + public async Task Create_Scheduled_Charge() { - return new Client(pkey: PublicKey, skey: SecretKey); + + var schedule = await client.Schedules.Create(new CreateScheduleRequest + { + Every = 2, + Period = SchedulePeriod.Day, + StartDate = DateTime.Now, + EndDate = DateTime.Now.AddYears(2), + On = new ScheduleOnRequest + { + Weekdays = new[] { Weekdays.Monday }, + }, + Charge = new ChargeScheduling + { + Amount = 2000, + Currency = "thb", + Customer = customerId, + }, + Transfer = new TransferScheduling() + { + Amount = 4000, + PercentageOfBalance = 3, + Recipient = recipientId + } + }); + + Console.WriteLine($"created schedule: {schedule.Id}"); + } + } } diff --git a/Omise.Tests/Resources/ChargeResourceTest.cs b/Omise.Tests/Resources/ChargeResourceTest.cs index 47f3b685..026bef9f 100644 --- a/Omise.Tests/Resources/ChargeResourceTest.cs +++ b/Omise.Tests/Resources/ChargeResourceTest.cs @@ -105,20 +105,15 @@ public void TestCreateChargeRequest() Description = "Test Charge", Capture = false, ReturnUri = "asdf", - Offsite = OffsiteTypes.InternetBankingBAY, - Flow = FlowTypes.Redirect, ExpiresAt = CreateExpiresAt(), }, @"{""customer"":""Omise Co., Ltd.""," + @"""card"":""card_test_123""," + @"""amount"":244884," + - @"""authorization_type"":null," + @"""currency"":""thb""," + @"""description"":""Test Charge""," + @"""expires_at"":""2023-08-08T17:00:00Z""," + @"""capture"":false," + - @"""offsite"":""internet_banking_bay""," + - @"""flow"":""redirect""," + @"""return_uri"":""asdf""}" ); } @@ -136,22 +131,17 @@ public void TestCreateChargeRequestWithWebHooks() Description = "Test Charge", Capture = false, ReturnUri = "asdf", - Offsite = OffsiteTypes.InternetBankingBAY, - Flow = FlowTypes.Redirect, ExpiresAt = CreateExpiresAt(), WebhookEndpoints = new string[] { "https://webhook.site/123" } }, @"{""customer"":""Omise Co., Ltd.""," + @"""card"":""card_test_123""," + @"""amount"":244884," + - @"""authorization_type"":null," + @"""currency"":""thb""," + @"""description"":""Test Charge""," + @"""expires_at"":""2023-08-08T17:00:00Z""," + @"""capture"":false," + - @"""offsite"":""internet_banking_bay""," + @"""webhook_endpoints"":[""https://webhook.site/123""]," + - @"""flow"":""redirect""," + @"""return_uri"":""asdf""}" ); } @@ -169,21 +159,16 @@ public void TestCreateChargeRequestWithPlatFormFee() Description = "Test Charge", Capture = false, ReturnUri = "asdf", - Offsite = OffsiteTypes.InternetBankingBAY, - Flow = FlowTypes.Redirect, ExpiresAt = CreateExpiresAt(), PlatformFee = new PlatformFeeRequest{ Fixed = 100, Percentage = 1} }, @"{""customer"":""Omise Co., Ltd.""," + @"""card"":""card_test_123""," + @"""amount"":244884," + - @"""authorization_type"":null," + @"""currency"":""thb""," + @"""description"":""Test Charge""," + @"""expires_at"":""2023-08-08T17:00:00Z""," + @"""capture"":false," + - @"""offsite"":""internet_banking_bay""," + - @"""flow"":""redirect""," + @"""return_uri"":""asdf""," + @"""platform_fee"":{""fixed"":100,""percentage"":1}}" ); @@ -203,8 +188,6 @@ public void TestPreAuthCreateChargeRequest() AuthorizationType = AuthTypes.PreAuth, Capture = false, ReturnUri = "asdf", - Offsite = OffsiteTypes.InternetBankingBAY, - Flow = FlowTypes.Redirect, ExpiresAt = CreateExpiresAt(), }, @"{""customer"":""Omise Co., Ltd.""," + @@ -215,8 +198,6 @@ public void TestPreAuthCreateChargeRequest() @"""description"":""Test Charge""," + @"""expires_at"":""2023-08-08T17:00:00Z""," + @"""capture"":false," + - @"""offsite"":""internet_banking_bay""," + - @"""flow"":""redirect""," + @"""return_uri"":""asdf""}" ); } diff --git a/Omise.Tests/Resources/DisputeResourceTest.cs b/Omise.Tests/Resources/DisputeResourceTest.cs index 43bd78f8..9f043255 100644 --- a/Omise.Tests/Resources/DisputeResourceTest.cs +++ b/Omise.Tests/Resources/DisputeResourceTest.cs @@ -1,25 +1,25 @@ using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using NUnit.Framework; using Omise.Models; using Omise.Resources; -namespace Omise.Tests.Resources +namespace Omise.Tests.Resources { [TestFixture] - public class DisputeResourceTest : ResourceTest + public class DisputeResourceTest : ResourceTest { const string DisputeId = "dspt_test_5089off452g5m5te7xs"; [Test] - public async Task TestGetList() + public async Task TestGetList() { await Resource.GetList(); AssertRequest("GET", "https://api.omise.co/disputes"); } [Test] - public async Task TestGetListByStatus() + public async Task TestGetListByStatus() { await Resource.OpenDisputes.GetList(); AssertRequest("GET", "https://api.omise.co/disputes/open"); @@ -30,31 +30,31 @@ public async Task TestGetListByStatus() } [Test] - public async Task TestGet() + public async Task TestGet() { await Resource.Get(DisputeId); AssertRequest("GET", "https://api.omise.co/disputes/{0}", DisputeId); } [Test] - public async Task TestUpdate() + public async Task TestUpdate() { await Resource.Update(DisputeId, BuildUpdateRequest()); AssertRequest("PATCH", "https://api.omise.co/disputes/{0}", DisputeId); } [Test] - public void TestUpdateDisputeRequest() - { - AssertSerializedRequest( - BuildUpdateRequest(), - @"{""message"":""Hello, This is definitely not ours.""," + - @"""metadata"":{""color"":""red""}}" + public void TestUpdateDisputeRequest() + { + AssertSerializedRequest( + BuildUpdateRequest(), + @"{""message"":""Hello, This is definitely not ours.""," + + @"""metadata"":{""color"":""red""}}" ); } [Test] - public async Task TestFixturesGetList() + public async Task TestFixturesGetList() { var list = await Fixtures.GetList(); Assert.AreEqual(1, list.Count); @@ -65,7 +65,7 @@ public async Task TestFixturesGetList() } [Test] - public async Task TestFixturesGet() + public async Task TestFixturesGet() { var dispute = await Fixtures.Get(DisputeId); Assert.AreEqual(DisputeId, dispute.Id); @@ -73,23 +73,23 @@ public async Task TestFixturesGet() } [Test] - public async Task TestFixturesUpdate() + public async Task TestFixturesUpdate() { var dispute = await Fixtures.Update(DisputeId, new UpdateDisputeRequest()); Assert.AreEqual(DisputeId, dispute.Id); Assert.AreEqual("Your dispute message", dispute.Message); } - protected UpdateDisputeRequest BuildUpdateRequest() + protected UpdateDisputeRequest BuildUpdateRequest() { - return new UpdateDisputeRequest + return new UpdateDisputeRequest { - Message = "Hello, This is definitely not ours.", + Message = "Hello, This is definitely not ours.", Metadata = new Dictionary { { "color", "red" } } }; } - protected override DisputeResource BuildResource(IRequester requester) + protected override DisputeResource BuildResource(IRequester requester) { return new DisputeResource(requester); } diff --git a/Omise.Tests/Resources/ScheduleResourceTest.cs b/Omise.Tests/Resources/ScheduleResourceTest.cs index 66c794cf..22925792 100644 --- a/Omise.Tests/Resources/ScheduleResourceTest.cs +++ b/Omise.Tests/Resources/ScheduleResourceTest.cs @@ -1,13 +1,13 @@ using System; -using NUnit.Framework; -using Omise.Resources; +using NUnit.Framework; +using Omise.Resources; using Omise.Models; using System.Threading.Tasks; - -namespace Omise.Tests.Resources -{ - [TestFixture] - public class ScheduleResourceTest : ResourceTest + +namespace Omise.Tests.Resources +{ + [TestFixture] + public class ScheduleResourceTest : ResourceTest { const string ScheduleId = "schd_test_57weuktrvln3bhtfolm"; const string CustomerId = "cust_test_57weukrimynz11hwz77"; @@ -41,44 +41,46 @@ public async Task TestDestroy() } [Test] - public void CreateScheduleRequest() - { + public void CreateScheduleRequest() + { AssertSerializedRequest( BuildCreateRequest(), @"{""every"":1," + @"""period"":""week""," + @"""on"":{""weekdays"":[""friday""]}," + + @"""start_date"":""2098-02-01T19:54:00""," + @"""end_date"":""2099-02-01T19:54:00""," + @"""charge"":{" + @"""amount"":3333," + - @"""currency"":""thb""," + + @"""currency"":""thb""," + @"""customer"":""cust_test_57weukrimynz11hwz77""}}" - ); + ); } protected CreateScheduleRequest BuildCreateRequest() { return new CreateScheduleRequest { - Every = 1, + Every = 1, Period = SchedulePeriod.Week, On = new ScheduleOnRequest { Weekdays = new[] { Weekdays.Friday }, }, EndDate = new DateTime(2099, 2, 1, 19, 54, 00), + StartDate = new DateTime(2098, 2, 1, 19, 54, 00), Charge = new ChargeScheduling { Amount = 3333, Currency = "thb", - Customer = CustomerId, + Customer = CustomerId, } }; } - - protected override ScheduleResource BuildResource(IRequester requester) + + protected override ScheduleResource BuildResource(IRequester requester) { - return new ScheduleResource(requester); - } - } -} + return new ScheduleResource(requester); + } + } +} diff --git a/Omise.Tests/Resources/TransferResourceTest.cs b/Omise.Tests/Resources/TransferResourceTest.cs index cf0bc3a0..415e1f0c 100644 --- a/Omise.Tests/Resources/TransferResourceTest.cs +++ b/Omise.Tests/Resources/TransferResourceTest.cs @@ -1,74 +1,56 @@ using System.Collections.Generic; -using System.Threading.Tasks; +using System.Threading.Tasks; using NUnit.Framework; using Omise.Models; using Omise.Resources; -namespace Omise.Tests.Resources +namespace Omise.Tests.Resources { [TestFixture] - public class TransferResourceTest : ResourceTest + public class TransferResourceTest : ResourceTest { const string TransferId = "trsf_test_4yqacz8t3cbipcj766u"; [Test] - public async Task TestGetList() + public async Task TestGetList() { await Resource.GetList(); AssertRequest("GET", "https://api.omise.co/transfers"); } [Test] - public async Task TestGet() + public async Task TestGet() { await Resource.Get(TransferId); AssertRequest("GET", "https://api.omise.co/transfers/{0}", TransferId); } [Test] - public async Task TestCreate() + public async Task TestCreate() { await Resource.Create(BuildCreateRequest()); AssertRequest("POST", "https://api.omise.co/transfers"); } [Test] - public async Task TestUpdate() - { - await Resource.Update(TransferId, BuildUpdateRequest()); - AssertRequest("PATCH", "https://api.omise.co/transfers/{0}", TransferId); - } - - [Test] - public async Task TestDestroy() + public async Task TestDestroy() { await Resource.Destroy(TransferId); AssertRequest("DELETE", "https://api.omise.co/transfers/{0}", TransferId); } [Test] - public void TestCreateTransferRequest() + public void TestCreateTransferRequest() { - AssertSerializedRequest( + AssertSerializedRequest( BuildCreateRequest(), - @"{""amount"":300000," + - @"""recipient"":""recp_test_123""," + - @"""fail_fast"":false," + - @"""metadata"":{""color"":""red""}}"
 ); + @"{""amount"":300000," + + @"""recipient"":""recp_test_123""," + + @"""metadata"":{""color"":""red""}}" ); } [Test] - public void TestUpdateTransferRequest() - { - AssertSerializedRequest( - BuildUpdateRequest(), - @"{""amount"":24488442," + - @"""metadata"":{""color"":""red""}}" - ); - } - - [Test] - public async Task TestFixturesGetList() + public async Task TestFixturesGetList() { var list = await Fixtures.GetList(); Assert.AreEqual(2, list.Count); @@ -79,7 +61,7 @@ public async Task TestFixturesGetList() } [Test] - public async Task TestFixturesGet() + public async Task TestFixturesGet() { var transfer = await Fixtures.Get(TransferId); Assert.AreEqual(TransferId, transfer.Id); @@ -87,7 +69,7 @@ public async Task TestFixturesGet() } [Test] - public async Task TestFixturesCreate() + public async Task TestFixturesCreate() { var transfer = await Fixtures.Create(new CreateTransferRequest()); Assert.AreEqual(TransferId, transfer.Id); @@ -95,41 +77,24 @@ public async Task TestFixturesCreate() } [Test] - public async Task TestFixturesUpdate() - { - var transfer = await Fixtures.Update(TransferId, new UpdateTransferRequest()); - Assert.AreEqual(TransferId, transfer.Id); - Assert.AreEqual(192189, transfer.Amount); - } - - [Test] - public async Task TestFixturesDestroy() + public async Task TestFixturesDestroy() { var transfer = await Fixtures.Destroy(TransferId); Assert.AreEqual(TransferId, transfer.Id); Assert.IsTrue(transfer.Deleted); } - protected CreateTransferRequest BuildCreateRequest() + protected CreateTransferRequest BuildCreateRequest() { - return new CreateTransferRequest + return new CreateTransferRequest { Recipient = "recp_test_123", - Amount = 300000, - Metadata = new Dictionary { { "color", "red" } } - }; - } - - protected UpdateTransferRequest BuildUpdateRequest() - { - return new UpdateTransferRequest - { - Amount = 24488442, + Amount = 300000, Metadata = new Dictionary { { "color", "red" } } }; } - protected override TransferResource BuildResource(IRequester requester) + protected override TransferResource BuildResource(IRequester requester) { return new TransferResource(requester); } diff --git a/Omise.Tests/SerializerTest.cs b/Omise.Tests/SerializerTest.cs index 818c025c..3f13b8b0 100644 --- a/Omise.Tests/SerializerTest.cs +++ b/Omise.Tests/SerializerTest.cs @@ -1,25 +1,25 @@ using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; -using System.Runtime.Serialization; +using System.Runtime.Serialization; using Newtonsoft.Json; using NUnit.Framework; using Omise.Tests.Util; -namespace Omise.Tests +namespace Omise.Tests { [TestFixture] - public class SerializerTest : OmiseTest + public class SerializerTest : OmiseTest { const string DummyJson = @"{""james"":""Howlett"",""scott"":""Summers"",""johny"":""Mnemonic""," + - @"""with"":""SPACES SPACES"",""created"":""9999-12-31T23:59:59.9999999""," + + @"""with"":""SPACES SPACES"",""created_at"":""9999-12-31T23:59:59.9999999""," + @"""checked"":true,""enumer"":""twth"",""enumer2"":""once"",""nullEnum"":null," + @"""nested"":{""field"":""inner""," + @"""filters"":{""dictionary"":""should works""}}}"; const string DummyUrlEncoded = "james=Howlett&scott=Summers&Johny=Mnemonic&" + - "with=SPACES+SPACES&created=9999-12-31T23%3A59%3A59Z&" + + "with=SPACES+SPACES&created_at=9999-12-31T23%3A59%3A59Z&" + "checked=true&enumer=twth&enumer2=once&" + "nested%5Bfield%5D=inner&nested%5Bfilters%5D%5Bdictionary%5D=should+works"; @@ -27,17 +27,17 @@ public class SerializerTest : OmiseTest SerializerTestDummy Dummy { get; set; } [SetUp] - public void Setup() + public void Setup() { Serializer = new Serializer(); Dummy = new SerializerTestDummy(); } [Test] - public void TestJsonSerialize() + public void TestJsonSerialize() { string result; - using (var stream = new StringMemoryStream()) + using (var stream = new StringMemoryStream()) { Serializer.JsonSerialize(stream, Dummy); result = stream.ToDecodedString(); @@ -47,12 +47,12 @@ public void TestJsonSerialize() } [Test] - public void TestJsonDeserialize() + public void TestJsonDeserialize() { var json = DummyJson; SerializerTestDummy result; - using (var stream = new StringMemoryStream(json)) + using (var stream = new StringMemoryStream(json)) { result = Serializer.JsonDeserialize(stream); } @@ -63,7 +63,7 @@ public void TestJsonDeserialize() } [Test] - public void TestJsonPopulate() + public void TestJsonPopulate() { Serializer.JsonPopulate(DummyJson, Dummy); Assert.AreEqual("Howlett", Dummy.James); @@ -71,7 +71,7 @@ public void TestJsonPopulate() } [Test] - public async Task TestExtractFormValues() + public async Task TestExtractFormValues() { var content = Serializer.ExtractFormValues(Dummy); var result = await content.ReadAsStringAsync(); @@ -79,7 +79,7 @@ public async Task TestExtractFormValues() } } - class SerializerTestDummy + class SerializerTestDummy { public string James { get; set; } public string Scott { get; set; } @@ -88,7 +88,8 @@ class SerializerTestDummy public string Aliased { get; set; } public string With { get; set; } - public DateTime Created { get; set; } + [JsonProperty("created_at")] + public DateTime CreatedAt { get; set; } public bool Checked { get; set; } public object FieldIsNull { get; set; } public DummyEnum Enumer { get; set; } @@ -96,7 +97,7 @@ class SerializerTestDummy public DummyEnum NullEnum { get; set; } public NestedKlass Nested { get; set; } - public enum DummyEnum + public enum DummyEnum { [EnumMember(Value = null)] None, @@ -105,25 +106,25 @@ public enum DummyEnum TwiceThrice, } - public class NestedKlass + public class NestedKlass { public string Field { get; set; } public IDictionary Filters { get; set; } } - public SerializerTestDummy() + public SerializerTestDummy() { James = "Howlett"; Scott = "Summers"; With = "SPACES SPACES"; - Created = DateTime.MaxValue; + CreatedAt = DateTime.MaxValue; Aliased = "Mnemonic"; Checked = true; FieldIsNull = null; Enumer = DummyEnum.TwiceThrice; Enumer2 = DummyEnum.Once; NullEnum = DummyEnum.None; - Nested = new NestedKlass + Nested = new NestedKlass { Field = "inner", Filters = new Dictionary { diff --git a/Omise/Client.cs b/Omise/Client.cs index a435e688..5e3df6ba 100644 --- a/Omise/Client.cs +++ b/Omise/Client.cs @@ -1,87 +1,86 @@ -using System; -using Omise.Resources; -using Omise.Models; - -namespace Omise -{ - public class Client +using System; +using Omise.Resources; +using Omise.Models; + +namespace Omise +{ + public class Client { // Default to the latest API Version. - private string apiVersion = "2017-11-02"; - - readonly IRequester requester; - readonly IEnvironment environment; - - public readonly AccountResource Account; - public readonly BalanceResource Balance; - public readonly CapabilityResource Capability; - public readonly ChargeResource Charges; - public readonly CustomerResource Customers; - public readonly DisputeResource Disputes; - public readonly EventResource Events; - public readonly ForexResource Forex; - public readonly LinkResource Links; - public readonly OccurrenceResource Occurrences; - public readonly PaymentSourceResource Sources; - public readonly ReceiptResource Receipts; - public readonly RecipientResource Recipients; - public readonly RefundResource Refunds; - public readonly ScheduleResource Schedules; - public readonly TokenResource Tokens; - public readonly TransactionResource Transactions; - public readonly TransferResource Transfers; - - public IRequester Requester - { - get { return requester; } - } - - public IEnvironment Environment - { - get { return environment; } - } - - public string APIVersion - { - get { return requester.APIVersion; } - set { requester.APIVersion = value; } - } - - public Client(string pkey = null, string skey = null, IEnvironment env = null) - : this(new Credentials(pkey, skey), env) - { - } - - public Client(Credentials credentials, IEnvironment env = null) - { - if (credentials == null) throw new ArgumentNullException(nameof(credentials)); - - environment = env ?? Environments.Production; - requester = new Requester(credentials, environment, null, this.apiVersion); - - Account = new AccountResource(requester); - Balance = new BalanceResource(requester); - Capability = new CapabilityResource(requester); - Charges = new ChargeResource(requester); - Customers = new CustomerResource(requester); - Disputes = new DisputeResource(requester); - Events = new EventResource(requester); - Forex = new ForexResource(requester); - Links = new LinkResource(requester); - Occurrences = new OccurrenceResource(requester); - Sources = new PaymentSourceResource(requester); - Receipts = new ReceiptResource(requester); - Recipients = new RecipientResource(requester); - Refunds = new RefundResource(requester); - Schedules = new ScheduleResource(requester); - Tokens = new TokenResource(requester); - Transactions = new TransactionResource(requester); - Transfers = new TransferResource(requester); - } - - public ChargeSpecificResource Charge(string chargeId) => new ChargeSpecificResource(requester, chargeId); - public CustomerSpecificResource Customer(string customerId) => new CustomerSpecificResource(requester, customerId); - public RecipientSpecificResource Recipient(string recipientId) => new RecipientSpecificResource(requester, recipientId); - public ScheduleSpecificResource Schedule(string scheduleId) => new ScheduleSpecificResource(requester, scheduleId); - } + private string apiVersion = "2019-05-29"; + + readonly IRequester requester; + readonly IEnvironment environment; + + public readonly AccountResource Account; + public readonly BalanceResource Balance; + public readonly CapabilityResource Capability; + public readonly ChargeResource Charges; + public readonly CustomerResource Customers; + public readonly DisputeResource Disputes; + public readonly EventResource Events; + public readonly ForexResource Forex; + public readonly LinkResource Links; + public readonly OccurrenceResource Occurrences; + public readonly PaymentSourceResource Sources; + public readonly ReceiptResource Receipts; + public readonly RecipientResource Recipients; + public readonly RefundResource Refunds; + public readonly ScheduleResource Schedules; + public readonly TokenResource Tokens; + public readonly TransactionResource Transactions; + public readonly TransferResource Transfers; + + public IRequester Requester + { + get { return requester; } + } + + public IEnvironment Environment + { + get { return environment; } + } + + public string APIVersion + { + get { return requester.APIVersion; } + } + + public Client(string pkey = null, string skey = null, IEnvironment env = null) + : this(new Credentials(pkey, skey), env) + { + } + + public Client(Credentials credentials, IEnvironment env = null) + { + if (credentials == null) throw new ArgumentNullException(nameof(credentials)); + + environment = env ?? Environments.Production; + requester = new Requester(credentials, environment, null, this.apiVersion); + + Account = new AccountResource(requester); + Balance = new BalanceResource(requester); + Capability = new CapabilityResource(requester); + Charges = new ChargeResource(requester); + Customers = new CustomerResource(requester); + Disputes = new DisputeResource(requester); + Events = new EventResource(requester); + Forex = new ForexResource(requester); + Links = new LinkResource(requester); + Occurrences = new OccurrenceResource(requester); + Sources = new PaymentSourceResource(requester); + Receipts = new ReceiptResource(requester); + Recipients = new RecipientResource(requester); + Refunds = new RefundResource(requester); + Schedules = new ScheduleResource(requester); + Tokens = new TokenResource(requester); + Transactions = new TransactionResource(requester); + Transfers = new TransferResource(requester); + } + + public ChargeSpecificResource Charge(string chargeId) => new ChargeSpecificResource(requester, chargeId); + public CustomerSpecificResource Customer(string customerId) => new CustomerSpecificResource(requester, customerId); + public RecipientSpecificResource Recipient(string recipientId) => new RecipientSpecificResource(requester, recipientId); + public ScheduleSpecificResource Schedule(string scheduleId) => new ScheduleSpecificResource(requester, scheduleId); + } } \ No newline at end of file diff --git a/Omise/Models/AuthTypes.cs b/Omise/Models/AuthTypes.cs index 74fe1ecf..f1d5bdf0 100644 --- a/Omise/Models/AuthTypes.cs +++ b/Omise/Models/AuthTypes.cs @@ -4,8 +4,6 @@ namespace Omise.Models { public enum AuthTypes { - [EnumMember(Value = null)] - None, [EnumMember(Value = "pre_auth")] PreAuth, [EnumMember(Value = "final_auth")] diff --git a/Omise/Models/ChargeRequest.cs b/Omise/Models/ChargeRequest.cs index 28fd897b..84354bc1 100644 --- a/Omise/Models/ChargeRequest.cs +++ b/Omise/Models/ChargeRequest.cs @@ -6,28 +6,37 @@ namespace Omise.Models { public class CreateChargeRequest : Request { - public string Customer { get; set; } - public string Card { get; set; } + public string? Customer { get; set; } + public string? Card { get; set; } public long Amount { get; set; } [JsonProperty("authorization_type")] - public AuthTypes AuthorizationType { get; set; } + // Explicit convertor setting as the serializer is not converting this enum properly + [JsonConverter(typeof(EnumValueConverter))] + public AuthTypes? AuthorizationType { get; set; } public string Currency { get; set; } - public string Description { get; set; } + public string? Description { get; set; } [JsonProperty("expires_at")] public DateTime? ExpiresAt { get; set; } - public IDictionary Metadata { get; set; } - public bool Capture { get; set; } - public OffsiteTypes Offsite { get; set; } - public PaymentSource Source { get; set; } + public IDictionary? Metadata { get; set; } + public bool? Capture { get; set; } + public PaymentSource? Source { get; set; } [JsonProperty("webhook_endpoints")] - public string[] WebhookEndpoints { get; set; } - public FlowTypes Flow { get; set; } - [JsonProperty("installment_terms")] - public int? InstallmentTerms { get; set; } + public string[]? WebhookEndpoints { get; set; } [JsonProperty("return_uri")] - public string ReturnUri { get; set; } + public string? ReturnUri { get; set; } [JsonProperty("platform_fee")] - public PlatformFeeRequest PlatformFee { get; set; } + public PlatformFeeRequest? PlatformFee { get; set; } + [JsonProperty("first_charge")] + public string? FirstCharge { get; set; } + public string? Ip { get; set; } + [JsonProperty("linked_account")] + public string? LinkedAccount { get; set; } + [JsonProperty("recurring_reason")] + public RecurringReason? RecurringReason { get; set; } + [JsonProperty("transaction_indicator")] + public string? TransactionIndicator { get; set; } + [JsonProperty("zero_interest_installments")] + public bool? ZeroInterestInstallments { get; set; } public CreateChargeRequest() { @@ -42,13 +51,13 @@ public class PlatformFeeRequest : Request public class UpdateChargeRequest : Request { - public string Description { get; set; } - public IDictionary Metadata { get; set; } + public string? Description { get; set; } + public IDictionary? Metadata { get; set; } } public class CaptureChargeRequest : Request { [JsonProperty("capture_amount")] - public long CaptureAmount { get; set; } + public long? CaptureAmount { get; set; } } } diff --git a/Omise/Models/ChargeScheduling.cs b/Omise/Models/ChargeScheduling.cs index 207fb1a8..5bff873c 100644 --- a/Omise/Models/ChargeScheduling.cs +++ b/Omise/Models/ChargeScheduling.cs @@ -1,12 +1,13 @@ using System; + namespace Omise.Models { public class ChargeScheduling { public long Amount { get; set; } public string Currency { get; set; } - public string Description { get; set; } + public string? Description { get; set; } public string Customer { get; set; } public string Card { get; set; } } diff --git a/Omise/Models/CustomerRequest.cs b/Omise/Models/CustomerRequest.cs index b41f5778..06e711d2 100644 --- a/Omise/Models/CustomerRequest.cs +++ b/Omise/Models/CustomerRequest.cs @@ -1,23 +1,25 @@ -using System.Collections.Generic; -using Newtonsoft.Json; - -namespace Omise.Models +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Omise.Models { - public class CreateCustomerRequest : CustomerRequest + public class CreateCustomerRequest : CustomerRequest { } - public class UpdateCustomerRequest : CustomerRequest + public class UpdateCustomerRequest : CustomerRequest { [JsonProperty("default_card")] public string DefaultCard { get; set; } } - public abstract class CustomerRequest : Request + public abstract class CustomerRequest : Request { - public string Email { get; set; } - public string Description { get; set; } - public IDictionary Metadata { get; set; } - public string Card { get; set; } + public string? Email { get; set; } + public string? Description { get; set; } + public IDictionary? Metadata { get; set; } + public string? Card { get; set; } + [JsonProperty("linked_account")] + public string? LinkedAccount { get; set; } } } \ No newline at end of file diff --git a/Omise/Models/DisputeStatus.cs b/Omise/Models/DisputeStatus.cs index 3ddab3cf..0defc9ea 100644 --- a/Omise/Models/DisputeStatus.cs +++ b/Omise/Models/DisputeStatus.cs @@ -1,6 +1,6 @@ -namespace Omise.Models +namespace Omise.Models { - public enum DisputeStatus + public enum DisputeStatus { Open, Pending, diff --git a/Omise/Models/ModelBase.cs b/Omise/Models/ModelBase.cs index 63113fc9..d1c82054 100644 --- a/Omise/Models/ModelBase.cs +++ b/Omise/Models/ModelBase.cs @@ -1,9 +1,9 @@ using System; using Newtonsoft.Json; -namespace Omise.Models +namespace Omise.Models { - public abstract class ModelBase + public abstract class ModelBase { [JsonIgnore] public IRequester Requester { get; internal set; } @@ -20,15 +20,17 @@ public abstract class ModelBase [JsonProperty("location")] public string Location { get; set; } - [JsonProperty("created")] - public DateTime Created { get; set; } + [JsonProperty("created_at")] + public DateTime CreatedAt { get; set; } + // TODO: should be removed in when response models are updated as this property is not actually available in all responses. [JsonProperty("deleted")] public bool Deleted { get; set; } + // TODO: Provide Task Reload() functionality. - public override bool Equals(object obj) + public override bool Equals(object obj) { if (obj == null) return false; var another = (ModelBase)obj; @@ -37,20 +39,20 @@ public override bool Equals(object obj) this.Id == another.Id && this.LiveMode == another.LiveMode && this.Location == another.Location && - this.Created == another.Created && + this.CreatedAt == another.CreatedAt&& this.Deleted == another.Deleted; } - public override int GetHashCode() + public override int GetHashCode() { - unchecked + unchecked { int hash = 17; hash = hash * 23 + Object.GetHashCode(); hash = hash * 23 + Id.GetHashCode(); hash = hash * 23 + LiveMode.GetHashCode(); hash = hash * 23 + Location.GetHashCode(); - hash = hash * 23 + Created.GetHashCode(); + hash = hash * 23 + CreatedAt.GetHashCode(); hash = hash * 23 + Deleted.GetHashCode(); return hash; diff --git a/Omise/Models/Models.cs b/Omise/Models/Models.cs index 4896631e..7c60b618 100644 --- a/Omise/Models/Models.cs +++ b/Omise/Models/Models.cs @@ -1,6 +1,6 @@ // // Generated from /Omise/Models/Models.tt -// on 25/3/2567 พ.ศ. 00:38:46 +// on 28/8/2567 พ.ศ. 15:16:04 using System; using System.Collections.Generic; using Newtonsoft.Json; @@ -40,8 +40,8 @@ public override int GetHashCode() { } public partial class Balance : ModelBase { - [JsonProperty("available")] - public long Available { get; set; } + [JsonProperty("transferable")] + public long Transferable { get; set; } [JsonProperty("total")] public long Total { get; set; } [JsonProperty("currency")] @@ -53,7 +53,7 @@ public override bool Equals(object obj) { if (another == null) return false; return base.Equals(obj) && - object.Equals(this.Available, another.Available) && + object.Equals(this.Transferable, another.Transferable) && object.Equals(this.Total, another.Total) && object.Equals(this.Currency, another.Currency) && true; @@ -62,8 +62,8 @@ public override bool Equals(object obj) { public override int GetHashCode() { unchecked { int hash = 17; - if (Available != default(long)) { - hash = hash * 23 + Available.GetHashCode(); + if (Transferable != default(long)) { + hash = hash * 23 + Transferable.GetHashCode(); } if (Total != default(long)) { hash = hash * 23 + Total.GetHashCode(); @@ -150,8 +150,8 @@ public override int GetHashCode() { public partial class BankAccount : ModelBase { [JsonProperty("brand")] public string Brand { get; set; } - [JsonProperty("number")] - public string Number { get; set; } + [JsonProperty("account_number")] + public string AccountNumber { get; set; } [JsonProperty("last_digits")] public string LastDigits { get; set; } [JsonProperty("name")] @@ -164,7 +164,7 @@ public override bool Equals(object obj) { return base.Equals(obj) && object.Equals(this.Brand, another.Brand) && - object.Equals(this.Number, another.Number) && + object.Equals(this.AccountNumber, another.AccountNumber) && object.Equals(this.LastDigits, another.LastDigits) && object.Equals(this.Name, another.Name) && true; @@ -176,8 +176,8 @@ public override int GetHashCode() { if (Brand != default(string)) { hash = hash * 23 + Brand.GetHashCode(); } - if (Number != default(string)) { - hash = hash * 23 + Number.GetHashCode(); + if (AccountNumber != default(string)) { + hash = hash * 23 + AccountNumber.GetHashCode(); } if (LastDigits != default(string)) { hash = hash * 23 + LastDigits.GetHashCode(); @@ -362,8 +362,8 @@ public partial class Charge : ModelBase { public Card Card { get; set; } [JsonProperty("source")] public PaymentSource Source { get; set; } - [JsonProperty("refunded")] - public long Refunded { get; set; } + [JsonProperty("refunded_amount")] + public long RefundedAmount { get; set; } [JsonProperty("refunds")] public ScopedList Refunds { get; set; } [JsonProperty("failure_code")] @@ -410,7 +410,7 @@ public override bool Equals(object obj) { object.Equals(this.SourceOfFund, another.SourceOfFund) && object.Equals(this.Card, another.Card) && object.Equals(this.Source, another.Source) && - object.Equals(this.Refunded, another.Refunded) && + object.Equals(this.RefundedAmount, another.RefundedAmount) && object.Equals(this.Refunds, another.Refunds) && object.Equals(this.FailureCode, another.FailureCode) && object.Equals(this.FailureMessage, another.FailureMessage) && @@ -479,8 +479,8 @@ public override int GetHashCode() { if (Source != default(PaymentSource)) { hash = hash * 23 + Source.GetHashCode(); } - if (Refunded != default(long)) { - hash = hash * 23 + Refunded.GetHashCode(); + if (RefundedAmount != default(long)) { + hash = hash * 23 + RefundedAmount.GetHashCode(); } if (Refunds != default(ScopedList)) { hash = hash * 23 + Refunds.GetHashCode(); @@ -1089,6 +1089,186 @@ public override int GetHashCode() { } } + public partial class Billing : ModelBase { + [JsonProperty("city")] + public string City { get; set; } + [JsonProperty("country")] + public string Country { get; set; } + [JsonProperty("postal_code")] + public string PostalCode { get; set; } + [JsonProperty("state")] + public string State { get; set; } + [JsonProperty("street1")] + public string Street1 { get; set; } + [JsonProperty("street2")] + public string? Street2 { get; set; } + + public override bool Equals(object obj) { + if (obj == null) return false; + var another = obj as Billing; + if (another == null) return false; + + return base.Equals(obj) && + object.Equals(this.City, another.City) && + object.Equals(this.Country, another.Country) && + object.Equals(this.PostalCode, another.PostalCode) && + object.Equals(this.State, another.State) && + object.Equals(this.Street1, another.Street1) && + object.Equals(this.Street2, another.Street2) && + true; + } + + public override int GetHashCode() { + unchecked { + int hash = 17; + if (City != default(string)) { + hash = hash * 23 + City.GetHashCode(); + } + if (Country != default(string)) { + hash = hash * 23 + Country.GetHashCode(); + } + if (PostalCode != default(string)) { + hash = hash * 23 + PostalCode.GetHashCode(); + } + if (State != default(string)) { + hash = hash * 23 + State.GetHashCode(); + } + if (Street1 != default(string)) { + hash = hash * 23 + Street1.GetHashCode(); + } + if (Street2 != default(string?)) { + hash = hash * 23 + Street2.GetHashCode(); + } + + return hash; + } + } + } + + public partial class Shipping : ModelBase { + [JsonProperty("city")] + public string City { get; set; } + [JsonProperty("country")] + public string Country { get; set; } + [JsonProperty("postal_code")] + public string PostalCode { get; set; } + [JsonProperty("state")] + public string State { get; set; } + [JsonProperty("street1")] + public string Street1 { get; set; } + [JsonProperty("street2")] + public string? Street2 { get; set; } + + public override bool Equals(object obj) { + if (obj == null) return false; + var another = obj as Shipping; + if (another == null) return false; + + return base.Equals(obj) && + object.Equals(this.City, another.City) && + object.Equals(this.Country, another.Country) && + object.Equals(this.PostalCode, another.PostalCode) && + object.Equals(this.State, another.State) && + object.Equals(this.Street1, another.Street1) && + object.Equals(this.Street2, another.Street2) && + true; + } + + public override int GetHashCode() { + unchecked { + int hash = 17; + if (City != default(string)) { + hash = hash * 23 + City.GetHashCode(); + } + if (Country != default(string)) { + hash = hash * 23 + Country.GetHashCode(); + } + if (PostalCode != default(string)) { + hash = hash * 23 + PostalCode.GetHashCode(); + } + if (State != default(string)) { + hash = hash * 23 + State.GetHashCode(); + } + if (Street1 != default(string)) { + hash = hash * 23 + Street1.GetHashCode(); + } + if (Street2 != default(string?)) { + hash = hash * 23 + Street2.GetHashCode(); + } + + return hash; + } + } + } + + public partial class Item : ModelBase { + [JsonProperty("amount")] + public long? Amount { get; set; } + [JsonProperty("sku")] + public string? Sku { get; set; } + [JsonProperty("name")] + public string? Name { get; set; } + [JsonProperty("quantity")] + public long? Quantity { get; set; } + [JsonProperty("category")] + public string? Category { get; set; } + [JsonProperty("brand")] + public string? Brand { get; set; } + [JsonProperty("item_uri")] + public string? ItemUri { get; set; } + [JsonProperty("image_uri")] + public string? ImageUri { get; set; } + + public override bool Equals(object obj) { + if (obj == null) return false; + var another = obj as Item; + if (another == null) return false; + + return base.Equals(obj) && + object.Equals(this.Amount, another.Amount) && + object.Equals(this.Sku, another.Sku) && + object.Equals(this.Name, another.Name) && + object.Equals(this.Quantity, another.Quantity) && + object.Equals(this.Category, another.Category) && + object.Equals(this.Brand, another.Brand) && + object.Equals(this.ItemUri, another.ItemUri) && + object.Equals(this.ImageUri, another.ImageUri) && + true; + } + + public override int GetHashCode() { + unchecked { + int hash = 17; + if (Amount != default(long?)) { + hash = hash * 23 + Amount.GetHashCode(); + } + if (Sku != default(string?)) { + hash = hash * 23 + Sku.GetHashCode(); + } + if (Name != default(string?)) { + hash = hash * 23 + Name.GetHashCode(); + } + if (Quantity != default(long?)) { + hash = hash * 23 + Quantity.GetHashCode(); + } + if (Category != default(string?)) { + hash = hash * 23 + Category.GetHashCode(); + } + if (Brand != default(string?)) { + hash = hash * 23 + Brand.GetHashCode(); + } + if (ItemUri != default(string?)) { + hash = hash * 23 + ItemUri.GetHashCode(); + } + if (ImageUri != default(string?)) { + hash = hash * 23 + ImageUri.GetHashCode(); + } + + return hash; + } + } + } + public partial class Receipt : ModelBase { [JsonProperty("number")] public string Number { get; set; } @@ -1656,6 +1836,9 @@ public partial class ModelTypes { { "paymentmethod", typeof(PaymentMethod) }, { "paymentreference", typeof(PaymentReference) }, { "paymentsource", typeof(PaymentSource) }, + { "billing", typeof(Billing) }, + { "shipping", typeof(Shipping) }, + { "item", typeof(Item) }, { "receipt", typeof(Receipt) }, { "recipient", typeof(Recipient) }, { "refund", typeof(Refund) }, @@ -1687,6 +1870,9 @@ public partial class ModelTypes { { typeof(PaymentMethod), "paymentmethod" }, { typeof(PaymentReference), "paymentreference" }, { typeof(PaymentSource), "paymentsource" }, + { typeof(Billing), "billing" }, + { typeof(Shipping), "shipping" }, + { typeof(Item), "item" }, { typeof(Receipt), "receipt" }, { typeof(Recipient), "recipient" }, { typeof(Refund), "refund" }, diff --git a/Omise/Models/Models.txt b/Omise/Models/Models.txt index 926e26ac..59c0b7cc 100644 --- a/Omise/Models/Models.txt +++ b/Omise/Models/Models.txt @@ -2,7 +2,7 @@ Email string Currency string Balance - Available long + Transferable long Total long Currency string Bank @@ -14,7 +14,7 @@ Barcode Image Document BankAccount bank_account Brand string - Number string + AccountNumber string account_number LastDigits string last_digits Name string Capability @@ -53,7 +53,7 @@ Charge SourceOfFund SourceOfFunds source_of_fund Card Card Source PaymentSource - Refunded long + RefundedAmount long refunded_amount Refunds ScopedList FailureCode string failure_code FailureMessage string failure_message @@ -134,6 +134,29 @@ PaymentSource StoreName string store_name TerminalId string terminal_id Ip string +Billing + City string + Country string + PostalCode string postal_code + State string + Street1 string + Street2 string? +Shipping + City string + Country string + PostalCode string postal_code + State string + Street1 string + Street2 string? +Item + Amount long? + Sku string? + Name string? + Quantity long? + Category string? + Brand string? + ItemUri string? item_uri + ImageUri string? image_uri Receipt Number string CustomerName string customer_name diff --git a/Omise/Models/PaymentSourceRequest.cs b/Omise/Models/PaymentSourceRequest.cs index 00b680f9..82a62cee 100644 --- a/Omise/Models/PaymentSourceRequest.cs +++ b/Omise/Models/PaymentSourceRequest.cs @@ -1,21 +1,37 @@ -using Newtonsoft.Json; +using System.Collections.Generic; +using Newtonsoft.Json; namespace Omise.Models { public class CreatePaymentSourceRequest : Request { public OffsiteTypes Type { get; set; } - public FlowTypes Flow { get; set; } + public FlowTypes? Flow { get; set; } [JsonProperty("platform_type")] - public PlatformTypes PlatformType { get; set; } + public PlatformTypes? PlatformType { get; set; } public long Amount { get; set; } public string Currency { get; set; } - public string Barcode { get; set; } - public string Bank { get; set; } - public string Email { get; set; } - - [JsonProperty("phone_number")] - public string PhoneNumber { get; set; } - public string Ip { get; set; } + public string? Barcode { get; set; } + public string? Bank { get; set; } + public string? Email { get; set; } + public string? Name { get; set; } + [JsonProperty("mobile_number")] + public string? MobileNumber { get; set; } + [JsonProperty("installment_term")] + public string? InstallmentTerm { get; set; } + [JsonProperty("promotion_code")] + public string? PromotionCode { get; set; } + [JsonProperty("store_id")] + public string? StoreId { get; set; } + [JsonProperty("store_name")] + public string? StoreName { get; set; } + [JsonProperty("terminal_id")] + public string? TerminalId { get; set; } + [JsonProperty("zero_interest_installments")] + public bool? ZeroInterestInstallments { get; set; } + public string? Ip { get; set; } + public Billing? Billing { get; set; } + public Shipping? Shipping { get; set; } + public List? Items { get; set; } } } diff --git a/Omise/Models/RecipientRequest.cs b/Omise/Models/RecipientRequest.cs index e5d2a8cf..3108e456 100644 --- a/Omise/Models/RecipientRequest.cs +++ b/Omise/Models/RecipientRequest.cs @@ -1,16 +1,18 @@ using Newtonsoft.Json; +using System.Collections.Generic; + +namespace Omise.Models -namespace Omise.Models { - public class CreateRecipientRequest : RecipientRequest + public class CreateRecipientRequest : RecipientRequest { } - public class UpdateRecipientRequest : RecipientRequest + public class UpdateRecipientRequest : RecipientRequest { } - public class RecipientRequest : Request + public class RecipientRequest : Request { public string Name { get; set; } public string Email { get; set; } @@ -22,5 +24,6 @@ public class RecipientRequest : Request [JsonProperty("bank_account")] public BankAccountRequest BankAccount { get; set; } + public IDictionary Metadata { get; set; } } } \ No newline at end of file diff --git a/Omise/Models/RecurringReason.cs b/Omise/Models/RecurringReason.cs new file mode 100644 index 00000000..431e0a7c --- /dev/null +++ b/Omise/Models/RecurringReason.cs @@ -0,0 +1,26 @@ +using System.Runtime.Serialization; + +namespace Omise.Models +{ + public enum RecurringReason + { + [EnumMember(Value = "blank")] + Blank, + [EnumMember(Value = "unscheduled")] + Unscheduled, + [EnumMember(Value = "standing_order")] + StandingOrder, + [EnumMember(Value = "subscription")] + Subscription, + [EnumMember(Value = "installment")] + Installment, + [EnumMember(Value = "partial_shipment")] + PartialShipment, + [EnumMember(Value = "delayed_charge")] + DelayedCharge, + [EnumMember(Value = "no_show")] + NoShow, + [EnumMember(Value = "resubmission")] + Resubmission + } +} \ No newline at end of file diff --git a/Omise/Models/ScheduleRequest.cs b/Omise/Models/ScheduleRequest.cs index a4bf9234..a131a161 100644 --- a/Omise/Models/ScheduleRequest.cs +++ b/Omise/Models/ScheduleRequest.cs @@ -10,20 +10,20 @@ public class ScheduleOnRequest : Request [JsonProperty("days_of_month")] public int[] DaysOfMonth { get; set; } [JsonProperty("weekday_of_month")] - public String WeekdayOfMonth { get; set; } + public string WeekdayOfMonth { get; set; } } public class CreateScheduleRequest : Request { public int Every { get; set; } public SchedulePeriod Period { get; set; } - public ScheduleOnRequest On { get; set; } + public ScheduleOnRequest? On { get; set; } [JsonProperty("start_date")] - public DateTime? StartDate { get; set; } + public DateTime StartDate { get; set; } [JsonProperty("end_date")] - public DateTime? EndDate { get; set; } - public ChargeScheduling Charge { get; set; } - public TransferScheduling Transfer { get; set; } + public DateTime EndDate { get; set; } + public ChargeScheduling? Charge { get; set; } + public TransferScheduling? Transfer { get; set; } public CreateScheduleRequest() { diff --git a/Omise/Models/SearchScope.cs b/Omise/Models/SearchScope.cs index 770c3d68..0c1cda1e 100644 --- a/Omise/Models/SearchScope.cs +++ b/Omise/Models/SearchScope.cs @@ -9,17 +9,25 @@ public enum SearchScope [EnumMember(Value = "dispute")] Dispute, [EnumMember(Value = "charge")] - Charge, + Charge, + [EnumMember(Value = "charge_schedule")] + ChargeSchedule, [EnumMember(Value = "customer")] - Customer, + Customer, [EnumMember(Value = "recipient")] Recipient, + [EnumMember(Value = "receipt")] + Receipt, [EnumMember(Value = "refund")] Refund, [EnumMember(Value = "transfer")] Transfer, + [EnumMember(Value = "transfer_schedule")] + TransferSchedule, [EnumMember(Value = "link")] - Link, + Link, + [EnumMember(Value = "transaction")] + Transaction, } } diff --git a/Omise/Models/TokenRequest.cs b/Omise/Models/TokenRequest.cs index a19f2945..b26f01f1 100644 --- a/Omise/Models/TokenRequest.cs +++ b/Omise/Models/TokenRequest.cs @@ -1,10 +1,10 @@ using Newtonsoft.Json; -namespace Omise.Models +namespace Omise.Models { // Will be serialized wrapped in a "card" key. // See TokenResource for more info. - public class CreateTokenRequest : Request + public class CreateTokenRequest : Request { [JsonProperty("name")] public string Name { get; set; } @@ -17,10 +17,18 @@ public class CreateTokenRequest : Request public int ExpirationYear { get; set; } [JsonProperty("security_code")] - public string SecurityCode { get; set; } + public string? SecurityCode { get; set; } [JsonProperty("city")] - public string City { get; set; } + public string? City { get; set; } + [JsonProperty("country")] + public string? Country { get; set; } [JsonProperty("postal_code")] - public string PostalCode { get; set; } + public string? PostalCode { get; set; } + [JsonProperty("phone_number")] + public string? PhoneNumber { get; set; } + public string? Email { get; set; } + public string? State { get; set; } + public string? Street1 { get; set; } + public string? Street2 { get; set; } } } \ No newline at end of file diff --git a/Omise/Models/TransferRequest.cs b/Omise/Models/TransferRequest.cs index cd026bd5..824b483c 100644 --- a/Omise/Models/TransferRequest.cs +++ b/Omise/Models/TransferRequest.cs @@ -5,15 +5,14 @@ namespace Omise.Models { public class CreateTransferRequest : Request { - public long Amount { get; set; } - public string Recipient { get; set; } + public long? Amount { get; set; } + public string? Recipient { get; set; } [JsonProperty("fail_fast")] - public bool FailFast { get; set; } public IDictionary Metadata { get; set; } - } - - public class UpdateTransferRequest : Request - { - public long Amount { get; set; } - public IDictionary Metadata { get; set; } + public bool? FailFast { get; set; } + [JsonProperty("split_transfer")] + public bool? SplitTransfer { get; set; } + [JsonProperty("idemp_key")] + public string? IdempKey { get; set; } + public IDictionary? Metadata { get; set; } } } \ No newline at end of file diff --git a/Omise/Omise.csproj b/Omise/Omise.csproj index 37fdac87..3243d286 100644 --- a/Omise/Omise.csproj +++ b/Omise/Omise.csproj @@ -12,6 +12,7 @@ See https://github.com/omise/omise-dotnet/blob/master/CHANGELOG.md for changes shipping in each version of the library. Omise C# bindings to the Omise API (https://www.omise.co/docs) + enable diff --git a/Omise/Resources/DisputeResource.cs b/Omise/Resources/DisputeResource.cs index 61d38a6a..f52a8f34 100644 --- a/Omise/Resources/DisputeResource.cs +++ b/Omise/Resources/DisputeResource.cs @@ -1,13 +1,13 @@ using System; using Omise.Models; -namespace Omise.Resources +namespace Omise.Resources { public class DisputeResource : BaseResource, IListable, IListRetrievable, IUpdatable, - ISearchable + ISearchable { public readonly StatusSpecificDispute OpenDisputes; public readonly StatusSpecificDispute PendingDisputes; @@ -16,7 +16,7 @@ public class DisputeResource : BaseResource, public SearchScope Scope => SearchScope.Dispute; public DisputeResource(IRequester requester) - : base(requester, Endpoint.Api, "/disputes") + : base(requester, Endpoint.Api, "/disputes") { OpenDisputes = new StatusSpecificDispute(DisputeStatus.Open, requester); PendingDisputes = new StatusSpecificDispute(DisputeStatus.Pending, requester); diff --git a/Omise/Resources/TransferResource.cs b/Omise/Resources/TransferResource.cs index ed7f7672..1013ecf8 100644 --- a/Omise/Resources/TransferResource.cs +++ b/Omise/Resources/TransferResource.cs @@ -1,24 +1,23 @@ using System; using Omise.Models; -namespace Omise.Resources +namespace Omise.Resources { public class TransferResource : BaseResource, IListable, IListRetrievable, ICreatable, - IUpdatable, IDestroyable, - ISearchable + ISearchable { public readonly TransferScheduleResource Schedules; - - public SearchScope Scope => SearchScope.Transfer; - + + public SearchScope Scope => SearchScope.Transfer; + public TransferResource(IRequester requester) - : base(requester, Endpoint.Api, "/transfers") + : base(requester, Endpoint.Api, "/transfers") { Schedules = new TransferScheduleResource(requester); - } + } } } \ No newline at end of file diff --git a/testdata/fixtures/api.omise.co/account-get.json b/testdata/fixtures/api.omise.co/account-get.json index 3e0135ce..e9510db2 100644 --- a/testdata/fixtures/api.omise.co/account-get.json +++ b/testdata/fixtures/api.omise.co/account-get.json @@ -3,5 +3,5 @@ "id": "acct_4yq6tcsyoged5c0ocxd", "location": "/account", "email": "chakrit@omise.co", - "created": "2015-12-16T05:55:29Z" + "created_at": "2015-12-16T05:55:29Z" } diff --git a/testdata/fixtures/api.omise.co/balance-get.json b/testdata/fixtures/api.omise.co/balance-get.json index 8c2288db..54903d3c 100644 --- a/testdata/fixtures/api.omise.co/balance-get.json +++ b/testdata/fixtures/api.omise.co/balance-get.json @@ -3,6 +3,6 @@ "livemode": false, "total": 96094, "location": "/balance", - "available": 12995317, + "transferable": 12995317, "currency": "thb" } diff --git a/testdata/fixtures/api.omise.co/charges-get.json b/testdata/fixtures/api.omise.co/charges-get.json index 1052c6bb..3be2eb68 100644 --- a/testdata/fixtures/api.omise.co/charges-get.json +++ b/testdata/fixtures/api.omise.co/charges-get.json @@ -18,7 +18,7 @@ "authorized": true, "transaction": "trxn_test_4yq7duwb9jts1vxgqua", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -28,9 +28,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2zk9qtf0y1pwe1zw/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -51,11 +49,11 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, "customer": "cust_test_4yq6txdpfadhbaqnwp3", "ip": null, - "created": "2015-01-15T05:00:29Z", + "created_at": "2015-01-15T05:00:29Z", "paid_at": "2015-01-15T05:00:29Z", "dispute": null } diff --git a/testdata/fixtures/api.omise.co/charges-post.json b/testdata/fixtures/api.omise.co/charges-post.json index d70e6588..c2a780d4 100644 --- a/testdata/fixtures/api.omise.co/charges-post.json +++ b/testdata/fixtures/api.omise.co/charges-post.json @@ -11,7 +11,7 @@ "authorized": true, "transaction": "trxn_test_4yq7duwb9jts1vxgqua", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -21,9 +21,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u3iklojvzzkz26a1w/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -44,7 +42,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, "source": { "object": "source", @@ -81,7 +79,7 @@ }, "customer": "cust_test_4yq6txdpfadhbaqnwp3", "ip": null, - "created": "2015-01-15T05:00:29Z", + "created_at": "2015-01-15T05:00:29Z", "paid_at": "2015-01-15T05:00:29Z", "dispute": null } diff --git a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-get.json b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-get.json index 00225762..828db414 100644 --- a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-get.json +++ b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-get.json @@ -10,7 +10,7 @@ "authorized": true, "captured": true, "transaction": "trxn_test_4yq7duwb9jts1vxgqua", - "refunded": 10000, + "refunded_amount": 10000, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -27,7 +27,7 @@ "currency": "thb", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", "transaction": "trxn_test_4yqmv79fzpy0gmz5mmq", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } ], "location": "/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds" @@ -50,9 +50,9 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, "customer": "cust_test_4yq6txdpfadhbaqnwp3", "ip": null, - "created": "2015-01-15T05:00:29Z" + "created_at": "2015-01-15T05:00:29Z" } diff --git a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-patch.json b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-patch.json index 488004dd..c04319c7 100644 --- a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-patch.json +++ b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq-patch.json @@ -10,7 +10,7 @@ "authorized": true, "captured": true, "transaction": "trxn_test_4yq7duwb9jts1vxgqua", - "refunded": 10000, + "refunded_amount": 10000, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -27,7 +27,7 @@ "currency": "thb", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", "transaction": "trxn_test_4yqmv79fzpy0gmz5mmq", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } ], "location": "/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds" @@ -50,9 +50,9 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, "customer": "cust_test_4yq6txdpfadhbaqnwp3", "ip": null, - "created": "2015-01-15T05:00:29Z" + "created_at": "2015-01-15T05:00:29Z" } diff --git a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-get.json b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-get.json index 076f872b..113a1c47 100644 --- a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-get.json +++ b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-get.json @@ -14,7 +14,7 @@ "currency": "thb", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", "transaction": "trxn_test_4yqmv79fzpy0gmz5mmq", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } ], "location": "/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds" diff --git a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-post.json b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-post.json index 558df35a..165b7ad4 100644 --- a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-post.json +++ b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds-post.json @@ -6,5 +6,5 @@ "currency": "thb", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", "transaction": "trxn_test_4yqmv79fzpy0gmz5mmq", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } diff --git a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds/rfnd_test_4yqmv79ahghsiz23y3c-get.json b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds/rfnd_test_4yqmv79ahghsiz23y3c-get.json index 558df35a..165b7ad4 100644 --- a/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds/rfnd_test_4yqmv79ahghsiz23y3c-get.json +++ b/testdata/fixtures/api.omise.co/charges/chrg_test_4yq7duw15p9hdrjp8oq/refunds/rfnd_test_4yqmv79ahghsiz23y3c-get.json @@ -6,5 +6,5 @@ "currency": "thb", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", "transaction": "trxn_test_4yqmv79fzpy0gmz5mmq", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } diff --git a/testdata/fixtures/api.omise.co/customers-get.json b/testdata/fixtures/api.omise.co/customers-get.json index 91917911..6b0d90d3 100644 --- a/testdata/fixtures/api.omise.co/customers-get.json +++ b/testdata/fixtures/api.omise.co/customers-get.json @@ -16,7 +16,7 @@ "default_card": "card_test_4yq6tuucl9h4erukfl0", "email": "john.doe@example.com", "description": "John Doe (id: 30)", - "created": "2015-01-15T04:03:52Z", + "created_at": "2015-01-15T04:03:52Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -44,7 +44,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" } ] } diff --git a/testdata/fixtures/api.omise.co/customers-post.json b/testdata/fixtures/api.omise.co/customers-post.json index 37026da1..e51528a0 100644 --- a/testdata/fixtures/api.omise.co/customers-post.json +++ b/testdata/fixtures/api.omise.co/customers-post.json @@ -6,7 +6,7 @@ "default_card": "card_test_4yq6tuucl9h4erukfl0", "email": "john.doe@example.com", "description": "John Doe (id: 30)", - "created": "2015-01-15T04:03:52Z", + "created_at": "2015-01-15T04:03:52Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -34,7 +34,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T07:44:35Z" + "created_at": "2016-01-28T07:44:35Z" } ] } diff --git a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-get.json b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-get.json index 336b1026..6ce326fc 100644 --- a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-get.json +++ b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-get.json @@ -6,7 +6,7 @@ "default_card": "card_test_4yq6tuucl9h4erukfl0", "email": "john.doe@example.com", "description": "John Doe (id: 30)", - "created": "2015-01-15T04:03:52Z", + "created_at": "2015-01-15T04:03:52Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -31,7 +31,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" } ], "location": "/customers/cust_test_4yq6txdpfadhbaqnwp3/cards" diff --git a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-patch.json b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-patch.json index 0b2b8288..3cc1f1e9 100644 --- a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-patch.json +++ b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3-patch.json @@ -6,7 +6,7 @@ "default_card": "card_test_4yq6tuucl9h4erukfl0", "email": "john.doe.the.second@example.com", "description": "John Doe (id: 30)", - "created": "2015-01-15T04:03:52Z", + "created_at": "2015-01-15T04:03:52Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -31,7 +31,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" } ], "location": "/customers/cust_test_4yq6txdpfadhbaqnwp3/cards" diff --git a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards-get.json b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards-get.json index 76940ed5..d9d1ce1b 100644 --- a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards-get.json +++ b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards-get.json @@ -3,7 +3,7 @@ "id": "", "livemode": false, "location": null, - "created": "0001-01-01T00:00:00Z", + "created_at": "0001-01-01T00:00:00Z", "from": "1970-01-01T00:00:00+00:00", "to": "2015-12-11T04:48:18+00:00", "offset": 0, @@ -15,7 +15,7 @@ "id": "card_test_4yq6tuucl9h4erukfl0", "livemode": false, "location": "/customers/cust_test_526y92xmu5fj7gsbzol/cards/card_test_4yq6tuucl9h4erukfl0", - "created": "2015-11-30T03:29:03Z", + "created_at": "2015-11-30T03:29:03Z", "country": "us", "city": "Bangkok", "bank": "", diff --git a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-get.json b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-get.json index 5ebf9406..0565e1bb 100644 --- a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-get.json +++ b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-get.json @@ -15,5 +15,5 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" } diff --git a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-patch.json b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-patch.json index 35076c98..e8882d8a 100644 --- a/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-patch.json +++ b/testdata/fixtures/api.omise.co/customers/cust_test_4yq6txdpfadhbaqnwp3/cards/card_test_4yq6tuucl9h4erukfl0-patch.json @@ -15,5 +15,5 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN W. DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" } diff --git a/testdata/fixtures/api.omise.co/disputes-get.json b/testdata/fixtures/api.omise.co/disputes-get.json index 9b2c06cc..a96f6988 100644 --- a/testdata/fixtures/api.omise.co/disputes-get.json +++ b/testdata/fixtures/api.omise.co/disputes-get.json @@ -18,7 +18,7 @@ "status": "open", "message": null, "charge": "chrg_test_5089odjlzg9j7tw4i1q", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } ] } diff --git a/testdata/fixtures/api.omise.co/disputes/closed-get.json b/testdata/fixtures/api.omise.co/disputes/closed-get.json index 6a3517fa..ef46ee81 100644 --- a/testdata/fixtures/api.omise.co/disputes/closed-get.json +++ b/testdata/fixtures/api.omise.co/disputes/closed-get.json @@ -16,7 +16,7 @@ "status": "won", "message": "This customer has send us his authorization to withdraw the fund from his card ....", "charge": "chrg_test_5089odjlzg9j7tw4i1q", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } ] } diff --git a/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-get.json b/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-get.json index dd71293c..a4716de5 100644 --- a/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-get.json +++ b/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-get.json @@ -8,5 +8,5 @@ "status": "open", "message": null, "charge": "chrg_test_5089odjlzg9j7tw4i1q", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } diff --git a/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-patch.json b/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-patch.json index 35314501..8fbbf660 100644 --- a/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-patch.json +++ b/testdata/fixtures/api.omise.co/disputes/dspt_test_5089off452g5m5te7xs-patch.json @@ -8,5 +8,5 @@ "status": "open", "message": "Your dispute message", "charge": "chrg_test_4yq7duw15p9hdrjp8oq", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } diff --git a/testdata/fixtures/api.omise.co/disputes/open-get.json b/testdata/fixtures/api.omise.co/disputes/open-get.json index 3e1e16c0..23b3d1eb 100644 --- a/testdata/fixtures/api.omise.co/disputes/open-get.json +++ b/testdata/fixtures/api.omise.co/disputes/open-get.json @@ -16,7 +16,7 @@ "status": "open", "message": null, "charge": "chrg_test_5089odjlzg9j7tw4i1q", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } ] } diff --git a/testdata/fixtures/api.omise.co/disputes/pending-get.json b/testdata/fixtures/api.omise.co/disputes/pending-get.json index aba63d06..d2ff5bdf 100644 --- a/testdata/fixtures/api.omise.co/disputes/pending-get.json +++ b/testdata/fixtures/api.omise.co/disputes/pending-get.json @@ -16,7 +16,7 @@ "status": "pending", "message": "This customer has send us his authorization to withdraw the fund from his card ....", "charge": "chrg_test_5089odjlzg9j7tw4i1q", - "created": "2015-06-02T10:22:32Z" + "created_at": "2015-06-02T10:22:32Z" } ] } diff --git a/testdata/fixtures/api.omise.co/events-get.json b/testdata/fixtures/api.omise.co/events-get.json index 9a2afbf5..5c9aed2c 100644 --- a/testdata/fixtures/api.omise.co/events-get.json +++ b/testdata/fixtures/api.omise.co/events-get.json @@ -13,7 +13,7 @@ "livemode": false, "location": "/events/evnt_test_5232t5tlhjwh7nbi14g", "key": "customer.create", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -22,7 +22,7 @@ "default_card": null, "email": "chakrit@omise.co", "description": "Omise", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -31,9 +31,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/customers/cust_test_5232t5thveg40ali15h/cards" } } @@ -44,7 +42,7 @@ "livemode": false, "location": "/events/evnt_test_5232t65g72920vkr9w1", "key": "customer.update", - "created": "2015-11-20T05:48:42Z", + "created_at": "2015-11-20T05:48:42Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -53,7 +51,7 @@ "default_card": "card_test_5232t61x6yfv27f6dug", "email": "chakrit@omise.co", "description": "Omise", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -80,7 +78,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:42Z" + "created_at": "2015-11-20T05:48:42Z" } ], "location": "/customers/cust_test_5232t5thveg40ali15h/cards" @@ -93,7 +91,7 @@ "livemode": false, "location": "/events/evnt_test_5232t66trxjwf9tpr24", "key": "customer.update", - "created": "2015-11-20T05:48:42Z", + "created_at": "2015-11-20T05:48:42Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -102,7 +100,7 @@ "default_card": "card_test_5232t61x6yfv27f6dug", "email": "chakrit@omise.co", "description": "Omise", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -129,7 +127,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:42Z" + "created_at": "2015-11-20T05:48:42Z" }, { "object": "card", @@ -148,7 +146,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:42Z" + "created_at": "2015-11-20T05:48:42Z" } ], "location": "/customers/cust_test_5232t5thveg40ali15h/cards" @@ -161,7 +159,7 @@ "livemode": false, "location": "/events/evnt_test_5232t694feig7wfr8o3", "key": "card.update", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "card", "id": "card_test_5232t61x6yfv27f6dug", @@ -179,7 +177,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Changed my name", "security_code_check": true, - "created": "2015-11-20T05:48:42Z" + "created_at": "2015-11-20T05:48:42Z" } }, { @@ -188,7 +186,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6b277w0eimrlmg", "key": "card.destroy", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "card", "id": "card_test_5232t61x6yfv27f6dug", @@ -202,7 +200,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6b6jzc3juf5l99", "key": "customer.update.card", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -211,7 +209,7 @@ "default_card": "card_test_5232t63qvuqmcgijgn2", "email": "chakrit@omise.co", "description": "Omise", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -238,7 +236,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:42Z" + "created_at": "2015-11-20T05:48:42Z" } ], "location": "/customers/cust_test_5232t5thveg40ali15h/cards" @@ -251,7 +249,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6ciskyzz9ogoow", "key": "card.destroy", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "card", "id": "card_test_5232t63qvuqmcgijgn2", @@ -265,7 +263,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6cnogtffq475v7", "key": "customer.update.card", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -274,7 +272,7 @@ "default_card": null, "email": "chakrit@omise.co", "description": "Omise", - "created": "2015-11-20T05:48:41Z", + "created_at": "2015-11-20T05:48:41Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -283,9 +281,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/customers/cust_test_5232t5thveg40ali15h/cards" } } @@ -296,7 +292,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6ek3n1ubeoapul", "key": "customer.destroy", - "created": "2015-11-20T05:48:43Z", + "created_at": "2015-11-20T05:48:43Z", "data": { "object": "customer", "id": "cust_test_5232t5thveg40ali15h", @@ -310,7 +306,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6i96aa0lmqukmq", "key": "charge.create", - "created": "2015-11-20T05:48:44Z", + "created_at": "2015-11-20T05:48:44Z", "data": { "object": "charge", "id": "chrg_test_5232t6h7dzu8e5rmnqv", @@ -324,7 +320,7 @@ "authorized": true, "transaction": "trxn_test_5232t6i17qfpaa0099m", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -333,9 +329,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5232t6h7dzu8e5rmnqv/refunds" }, "failure_code": null, @@ -356,12 +350,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:44Z" + "created_at": "2015-11-20T05:48:44Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2015-11-20T05:48:44Z" + "created_at": "2015-11-20T05:48:44Z" } }, { @@ -370,7 +364,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6kwxnobb0raiu7", "key": "charge.update", - "created": "2015-11-20T05:48:44Z", + "created_at": "2015-11-20T05:48:44Z", "data": { "object": "charge", "id": "chrg_test_5232t6h7dzu8e5rmnqv", @@ -384,7 +378,7 @@ "authorized": true, "transaction": "trxn_test_5232t6i17qfpaa0099m", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -393,9 +387,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5232t6h7dzu8e5rmnqv/refunds" }, "failure_code": null, @@ -416,12 +408,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:44Z" + "created_at": "2015-11-20T05:48:44Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2015-11-20T05:48:44Z" + "created_at": "2015-11-20T05:48:44Z" } }, { @@ -430,7 +422,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6t67lrd31th8od", "key": "charge.create", - "created": "2015-11-20T05:48:45Z", + "created_at": "2015-11-20T05:48:45Z", "data": { "object": "charge", "id": "chrg_test_5232t6rvomzcnnmq2xy", @@ -444,7 +436,7 @@ "authorized": true, "paid": false, "transaction": null, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -453,9 +445,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5232t6rvomzcnnmq2xy/refunds" }, "failure_code": null, @@ -476,12 +466,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:45Z" + "created_at": "2015-11-20T05:48:45Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2015-11-20T05:48:45Z" + "created_at": "2015-11-20T05:48:45Z" } }, { @@ -490,7 +480,7 @@ "livemode": false, "location": "/events/evnt_test_5232t6vbpnjl66ouvwc", "key": "charge.capture", - "created": "2015-11-20T05:48:46Z", + "created_at": "2015-11-20T05:48:46Z", "data": { "object": "charge", "id": "chrg_test_5232t6rvomzcnnmq2xy", @@ -504,7 +494,7 @@ "authorized": true, "transaction": "trxn_test_5232t6v2dow26g8ua2s", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -513,9 +503,7 @@ "limit": 20, "total": 0, "order": null, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5232t6rvomzcnnmq2xy/refunds" }, "failure_code": null, @@ -536,12 +524,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:45Z" + "created_at": "2015-11-20T05:48:45Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2015-11-20T05:48:45Z" + "created_at": "2015-11-20T05:48:45Z" } }, { @@ -550,7 +538,7 @@ "livemode": false, "location": "/events/evnt_test_5232t73wqqstr89ic9a", "key": "customer.create", - "created": "2015-11-20T05:48:47Z", + "created_at": "2015-11-20T05:48:47Z", "data": { "object": "customer", "id": "cust_test_5232t73plql7mkh8nv0", @@ -559,7 +547,7 @@ "default_card": "card_test_5232t720jr2pyhioeso", "email": "chakrit@omise.co", "description": "I'm JACK", - "created": "2015-11-20T05:48:47Z", + "created_at": "2015-11-20T05:48:47Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -586,7 +574,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:47Z" + "created_at": "2015-11-20T05:48:47Z" } ], "location": "/customers/cust_test_5232t73plql7mkh8nv0/cards" @@ -599,7 +587,7 @@ "livemode": false, "location": "/events/evnt_test_5232t75p2y60vqc5ahs", "key": "customer.update", - "created": "2015-11-20T05:48:47Z", + "created_at": "2015-11-20T05:48:47Z", "data": { "object": "customer", "id": "cust_test_5232t73plql7mkh8nv0", @@ -608,7 +596,7 @@ "default_card": "card_test_5232t720jr2pyhioeso", "email": "chakrit@omise.co", "description": "I'm JOHN now.", - "created": "2015-11-20T05:48:47Z", + "created_at": "2015-11-20T05:48:47Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -635,7 +623,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:47Z" + "created_at": "2015-11-20T05:48:47Z" } ], "location": "/customers/cust_test_5232t73plql7mkh8nv0/cards" @@ -648,7 +636,7 @@ "livemode": false, "location": "/events/evnt_test_5232t785ibrca9biqf8", "key": "customer.destroy", - "created": "2015-11-20T05:48:47Z", + "created_at": "2015-11-20T05:48:47Z", "data": { "object": "customer", "id": "cust_test_5232t73plql7mkh8nv0", @@ -662,7 +650,7 @@ "livemode": false, "location": "/events/evnt_test_5232t79xjha5hkur2ae", "key": "recipient.create", - "created": "2015-11-20T05:48:48Z", + "created_at": "2015-11-20T05:48:48Z", "data": { "object": "recipient", "id": "recp_test_5232t79suym0nbt6x5w", @@ -680,10 +668,10 @@ "brand": "bbl", "last_digits": "7890", "name": "Somchai Prasert", - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" }, "failure_code": null, - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" } }, { @@ -692,7 +680,7 @@ "livemode": false, "location": "/events/evnt_test_5232t7ba9q3cx0ldypa", "key": "recipient.update", - "created": "2015-11-20T05:48:48Z", + "created_at": "2015-11-20T05:48:48Z", "data": { "object": "recipient", "id": "recp_test_5232t79suym0nbt6x5w", @@ -710,10 +698,10 @@ "brand": "bbl", "last_digits": "7890", "name": "Somchai Prasert", - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" }, "failure_code": null, - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" } }, { @@ -722,7 +710,7 @@ "livemode": false, "location": "/events/evnt_test_5232t7da0f1bnwgn198", "key": "recipient.destroy", - "created": "2015-11-20T05:48:48Z", + "created_at": "2015-11-20T05:48:48Z", "data": { "object": "recipient", "id": "recp_test_5232t79suym0nbt6x5w", @@ -736,7 +724,7 @@ "livemode": false, "location": "/events/evnt_test_5232t7hgjw6d6kzvbaa", "key": "charge.create", - "created": "2015-11-20T05:48:49Z", + "created_at": "2015-11-20T05:48:49Z", "data": { "object": "charge", "id": "chrg_test_5232t7frh0sz71fpx69", @@ -750,7 +738,7 @@ "authorized": true, "transaction": "trxn_test_5232t7h3e1700tpnr6i", "paid": true, - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -758,9 +746,7 @@ "offset": 0, "limit": 20, "total": 0, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5232t7frh0sz71fpx69/refunds" }, "failure_code": null, @@ -781,12 +767,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2015-11-20T05:48:48Z" + "created_at": "2015-11-20T05:48:48Z" } } ] diff --git a/testdata/fixtures/api.omise.co/events/evnt_test_526yctupnje5mbldskd-get.json b/testdata/fixtures/api.omise.co/events/evnt_test_526yctupnje5mbldskd-get.json index a84f03b4..a1810961 100644 --- a/testdata/fixtures/api.omise.co/events/evnt_test_526yctupnje5mbldskd-get.json +++ b/testdata/fixtures/api.omise.co/events/evnt_test_526yctupnje5mbldskd-get.json @@ -4,7 +4,7 @@ "livemode": false, "location": "/events/evnt_test_526yctupnje5mbldskd", "key": "transfer.destroy", - "created": "2015-11-30T03:39:42Z", + "created_at": "2015-11-30T03:39:42Z", "data": { "object": "transfer", "id": "trsf_test_526yctqob5djkckq88a", diff --git a/testdata/fixtures/api.omise.co/recipients-get.json b/testdata/fixtures/api.omise.co/recipients-get.json index 608bb5d5..9305062f 100644 --- a/testdata/fixtures/api.omise.co/recipients-get.json +++ b/testdata/fixtures/api.omise.co/recipients-get.json @@ -25,10 +25,10 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, "failure_code": null, - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" } ] } diff --git a/testdata/fixtures/api.omise.co/recipients-post.json b/testdata/fixtures/api.omise.co/recipients-post.json index edb81be2..8955b0ba 100644 --- a/testdata/fixtures/api.omise.co/recipients-post.json +++ b/testdata/fixtures/api.omise.co/recipients-post.json @@ -15,8 +15,8 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, "failure_code": null, - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" } diff --git a/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-get.json b/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-get.json index 4a776895..b7f6737d 100644 --- a/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-get.json +++ b/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-get.json @@ -15,8 +15,8 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, "failure_code": null, - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" } diff --git a/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-patch.json b/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-patch.json index cb70ba8e..37360e35 100644 --- a/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-patch.json +++ b/testdata/fixtures/api.omise.co/recipients/recp_test_50894vc13y8z4v51iuc-patch.json @@ -15,8 +15,8 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, "failure_code": null, - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" } diff --git a/testdata/fixtures/api.omise.co/search-get.json b/testdata/fixtures/api.omise.co/search-get.json index cc08ed07..41eea8c2 100644 --- a/testdata/fixtures/api.omise.co/search-get.json +++ b/testdata/fixtures/api.omise.co/search-get.json @@ -24,7 +24,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_558xxh2pjd3z2vixy70", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -34,9 +34,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_558xxh0el72ust8ogda/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -56,12 +54,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-09-06T08:34:18Z" + "created_at": "2016-09-06T08:34:18Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-09-06T08:34:18Z" + "created_at": "2016-09-06T08:34:18Z" }, { "object": "charge", @@ -77,7 +75,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_558wk39xmg2to2tq1ip", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -87,9 +85,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_558wk37hqxp2b5qsaxq/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -109,12 +105,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-09-06T06:14:01Z" + "created_at": "2016-09-06T06:14:01Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-09-06T06:14:01Z" + "created_at": "2016-09-06T06:14:01Z" }, { "object": "charge", @@ -130,7 +126,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_558v9jf9z2g3pwlro4i", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -140,9 +136,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_558v9jb0yf01a063g5y/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -162,12 +156,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-09-06T04:01:46Z" + "created_at": "2016-09-06T04:01:46Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-09-06T04:01:47Z" + "created_at": "2016-09-06T04:01:47Z" }, { "object": "charge", @@ -183,7 +177,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53lfvfk124q4l6vubmd", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -203,7 +197,7 @@ "voided": true, "charge": "chrg_test_53lfvfic0j592fudac4", "transaction": "trxn_test_53li53xpwl1k00ljs27", - "created": "2016-04-07T09:24:07Z" + "created_at": "2016-04-07T09:24:07Z" } ] }, @@ -225,12 +219,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-07T05:32:06Z" + "created_at": "2016-04-07T05:32:06Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-07T05:32:06Z" + "created_at": "2016-04-07T05:32:06Z" }, { "object": "charge", @@ -246,7 +240,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53kq3a8v9hhu56oirkl", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -266,7 +260,7 @@ "voided": false, "charge": "chrg_test_53kq3a6ybpjdxsexn03", "transaction": "trxn_test_53lj0vtrxmob7y3fts5", - "created": "2016-04-07T10:54:23Z" + "created_at": "2016-04-07T10:54:23Z" } ] }, @@ -288,12 +282,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-05T09:35:27Z" + "created_at": "2016-04-05T09:35:27Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-05T09:35:27Z" + "created_at": "2016-04-05T09:35:27Z" }, { "object": "charge", @@ -309,7 +303,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53kq2j94lsp15209uan", - "refunded": 819338, + "refunded_amount": 819338, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -329,7 +323,7 @@ "voided": false, "charge": "chrg_test_53kq2j78f906fqff2dx", "transaction": "trxn_test_53li9qii4o39y9gm15j", - "created": "2016-04-07T09:37:16Z" + "created_at": "2016-04-07T09:37:16Z" }, { "object": "refund", @@ -340,7 +334,7 @@ "voided": false, "charge": "chrg_test_53kq2j78f906fqff2dx", "transaction": "trxn_test_53li9qim8cn0jjif8kt", - "created": "2016-04-07T09:37:16Z" + "created_at": "2016-04-07T09:37:16Z" } ] }, @@ -362,12 +356,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-05T09:33:19Z" + "created_at": "2016-04-05T09:33:19Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-05T09:33:20Z" + "created_at": "2016-04-05T09:33:20Z" }, { "object": "charge", @@ -383,7 +377,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53kpymrnw8am5jpvl2a", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -393,9 +387,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_53kpymq2p8qfawezacz/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -415,12 +407,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-05T09:22:14Z" + "created_at": "2016-04-05T09:22:14Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-05T09:22:14Z" + "created_at": "2016-04-05T09:22:14Z" }, { "object": "charge", @@ -436,7 +428,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53kpuqryueus8if7z7w", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -446,9 +438,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_53kpuqq26w09ytvm80j/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -468,12 +458,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-05T09:11:11Z" + "created_at": "2016-04-05T09:11:11Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-05T09:11:12Z" + "created_at": "2016-04-05T09:11:12Z" }, { "object": "charge", @@ -489,7 +479,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53kpum62cxz6g9p6wes", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -499,9 +489,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_53kpum3hbj67zhlu3ht/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -521,12 +509,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-04-05T09:10:49Z" + "created_at": "2016-04-05T09:10:49Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-04-05T09:10:50Z" + "created_at": "2016-04-05T09:10:50Z" }, { "object": "charge", @@ -542,7 +530,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_53ipesvehmm14mnudz4", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -552,9 +540,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_53ipestocb03ap15uec/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -574,12 +560,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-03-31T05:42:40Z" + "created_at": "2016-03-31T05:42:40Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-03-31T05:42:40Z" + "created_at": "2016-03-31T05:42:40Z" }, { "object": "charge", @@ -595,7 +581,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52ydurjocpf4l57tldj", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -605,9 +591,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52ydurgt5nhckrxbvxh/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -627,12 +611,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-02-08T06:48:24Z" + "created_at": "2016-02-08T06:48:24Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-02-08T06:48:24Z" + "created_at": "2016-02-08T06:48:24Z" }, { "object": "charge", @@ -648,7 +632,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52ydufq5bb5zhw2r6f8", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -658,9 +642,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52ydufnwb5nzcp9n3ao/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -680,12 +662,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-02-08T06:47:28Z" + "created_at": "2016-02-08T06:47:28Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-02-08T06:47:28Z" + "created_at": "2016-02-08T06:47:28Z" }, { "object": "charge", @@ -701,7 +683,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52ydtsg030oif1hzj2t", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -711,9 +693,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52ydtsb1vu6c60q83jc/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -733,12 +713,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-02-08T06:45:37Z" + "created_at": "2016-02-08T06:45:37Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-02-08T06:45:37Z" + "created_at": "2016-02-08T06:45:37Z" }, { "object": "charge", @@ -754,7 +734,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52ydss9f5t5qn3eukbs", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -764,9 +744,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52ydss6rlsx8dgdz48k/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -786,12 +764,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-02-08T06:42:46Z" + "created_at": "2016-02-08T06:42:46Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-02-08T06:42:46Z" + "created_at": "2016-02-08T06:42:46Z" }, { "object": "charge", @@ -807,7 +785,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u3y2n9vahbemxivjt", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -817,9 +795,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u3y2l6lu5qwscu788/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -839,12 +815,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T08:28:38Z" + "created_at": "2016-01-28T08:28:38Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T08:28:39Z" + "created_at": "2016-01-28T08:28:39Z" }, { "object": "charge", @@ -860,7 +836,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u3sbdbiek50b9wzac", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -870,9 +846,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u3sbblegqwovjuw9d/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -892,12 +866,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T08:12:17Z" + "created_at": "2016-01-28T08:12:17Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T08:12:17Z" + "created_at": "2016-01-28T08:12:17Z" }, { "object": "charge", @@ -913,7 +887,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u3ijwvchs6ygyqs1i", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -923,9 +897,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u3ijup2gahxim1vub/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -945,7 +917,7 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T07:44:33Z" + "created_at": "2016-01-28T07:44:33Z" }, "customer": null, "ip": null, @@ -962,9 +934,9 @@ "reason_code": "not_recorded", "reason_message": "Reason was not recorded.", "charge": "chrg_test_52u3ijup2gahxim1vub", - "created": "2016-02-08T08:10:41Z" + "created_at": "2016-02-08T08:10:41Z" }, - "created": "2016-01-28T07:44:33Z" + "created_at": "2016-01-28T07:44:33Z" }, { "object": "charge", @@ -980,7 +952,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u325s1xqxa1xcojwb", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -990,9 +962,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u325q74caqelye90n/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1012,12 +982,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T06:57:59Z" + "created_at": "2016-01-28T06:57:59Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T06:57:59Z" + "created_at": "2016-01-28T06:57:59Z" }, { "object": "charge", @@ -1033,7 +1003,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2zkjod8ffnmtf9s9", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1043,9 +1013,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2zkh2oywfwdbeht8/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1065,12 +1033,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T06:50:38Z" + "created_at": "2016-01-28T06:50:38Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T06:50:38Z" + "created_at": "2016-01-28T06:50:38Z" }, { "object": "charge", @@ -1086,7 +1054,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2jie8oy6qzov1qx5", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1096,9 +1064,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2jibtxhhypj3k4ix/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1118,12 +1084,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T06:05:00Z" + "created_at": "2016-01-28T06:05:00Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T06:05:00Z" + "created_at": "2016-01-28T06:05:00Z" }, { "object": "charge", @@ -1139,7 +1105,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2j7yu5utmr8anl9s", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1149,9 +1115,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2j7x3hf1iju22qfq/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1171,12 +1135,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T06:04:11Z" + "created_at": "2016-01-28T06:04:11Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T06:04:11Z" + "created_at": "2016-01-28T06:04:11Z" }, { "object": "charge", @@ -1192,7 +1156,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2im26a6g1n9caei3", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1202,9 +1166,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2ilzn5rrhb2s6ssc/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1224,12 +1186,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T06:02:27Z" + "created_at": "2016-01-28T06:02:27Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T06:02:27Z" + "created_at": "2016-01-28T06:02:27Z" }, { "object": "charge", @@ -1245,7 +1207,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2h7rxsbg06m2nyqb", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1255,9 +1217,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2h7q6a1fz4msrqdk/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1277,12 +1237,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T05:58:29Z" + "created_at": "2016-01-28T05:58:29Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T05:58:29Z" + "created_at": "2016-01-28T05:58:29Z" }, { "object": "charge", @@ -1298,7 +1258,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52u2g6dqfhsjdek5dmk", - "refunded": 0, + "refunded_amount": 0, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1308,9 +1268,7 @@ "total": 0, "order": null, "location": "/charges/chrg_test_52u2g6c0242hmjvmdi6/refunds", - "data": [ - - ] + "data": [] }, "failure_code": null, "failure_message": null, @@ -1330,12 +1288,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-28T05:55:32Z" + "created_at": "2016-01-28T05:55:32Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-28T05:55:32Z" + "created_at": "2016-01-28T05:55:32Z" }, { "object": "charge", @@ -1351,7 +1309,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4uqzvjksb56q1zyb", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1371,7 +1329,7 @@ "voided": false, "charge": "chrg_test_52q4uqxlpit8xy9y23n", "transaction": "trxn_test_53cw5kreluzp64egwlj", - "created": "2016-03-16T09:02:37Z" + "created_at": "2016-03-16T09:02:37Z" } ] }, @@ -1393,12 +1351,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:34:59Z" + "created_at": "2016-01-18T04:34:59Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:34:59Z" + "created_at": "2016-01-18T04:34:59Z" }, { "object": "charge", @@ -1414,7 +1372,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4tl58irpp6h5dmu2", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1434,7 +1392,7 @@ "voided": false, "charge": "chrg_test_52q4tl3fcv52rvkvy31", "transaction": "trxn_test_53cfd44bofua06qd84x", - "created": "2016-03-15T04:25:29Z" + "created_at": "2016-03-15T04:25:29Z" } ] }, @@ -1456,12 +1414,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:31:41Z" + "created_at": "2016-01-18T04:31:41Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:31:41Z" + "created_at": "2016-01-18T04:31:41Z" }, { "object": "charge", @@ -1477,7 +1435,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4sr1xmvq0jg998fs", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1497,7 +1455,7 @@ "voided": false, "charge": "chrg_test_52q4sqzs7pu2m51kkkk", "transaction": "trxn_test_53cfk3kpllgria0m97e", - "created": "2016-03-15T04:45:19Z" + "created_at": "2016-03-15T04:45:19Z" } ] }, @@ -1519,12 +1477,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:29:19Z" + "created_at": "2016-01-18T04:29:19Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:29:19Z" + "created_at": "2016-01-18T04:29:19Z" }, { "object": "charge", @@ -1540,7 +1498,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4sdemkwzbibbhw18", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1560,7 +1518,7 @@ "voided": false, "charge": "chrg_test_52q4sdchosuwisluuvz", "transaction": "trxn_test_53cvnnmtahdhdg102vg", - "created": "2016-03-16T08:11:42Z" + "created_at": "2016-03-16T08:11:42Z" } ] }, @@ -1582,12 +1540,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:28:14Z" + "created_at": "2016-01-18T04:28:14Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:28:14Z" + "created_at": "2016-01-18T04:28:14Z" }, { "object": "charge", @@ -1603,7 +1561,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4rjwin4j4290s7ha", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1623,7 +1581,7 @@ "voided": false, "charge": "chrg_test_52q4rjuyjp4a219g0fk", "transaction": "trxn_test_53c4u5zwg8jwm6it8ez", - "created": "2016-03-14T10:28:59Z" + "created_at": "2016-03-14T10:28:59Z" } ] }, @@ -1645,12 +1603,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:25:54Z" + "created_at": "2016-01-18T04:25:54Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:25:54Z" + "created_at": "2016-01-18T04:25:54Z" }, { "object": "charge", @@ -1666,7 +1624,7 @@ "reversed": false, "paid": true, "transaction": "trxn_test_52q4recxh1oy0vmpfq0", - "refunded": 409669, + "refunded_amount": 409669, "refunds": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -1686,7 +1644,7 @@ "voided": false, "charge": "chrg_test_52q4reap0eauyemqvgc", "transaction": "trxn_test_53c41ybdm9gf1pcpigq", - "created": "2016-03-14T09:08:50Z" + "created_at": "2016-03-14T09:08:50Z" } ] }, @@ -1708,12 +1666,12 @@ "fingerprint": "mJnCcSbRLzwfV62Do9MAmjpXlzDBVJ/hvu8go4JYyqU=", "name": "Chakrit Wichian", "security_code_check": true, - "created": "2016-01-18T04:25:28Z" + "created_at": "2016-01-18T04:25:28Z" }, "customer": null, "ip": null, "dispute": null, - "created": "2016-01-18T04:25:28Z" + "created_at": "2016-01-18T04:25:28Z" } ] } diff --git a/testdata/fixtures/api.omise.co/transactions-get.json b/testdata/fixtures/api.omise.co/transactions-get.json index 080a59ff..897880ac 100644 --- a/testdata/fixtures/api.omise.co/transactions-get.json +++ b/testdata/fixtures/api.omise.co/transactions-get.json @@ -15,7 +15,7 @@ "type": "credit", "amount": 96094, "currency": "THB", - "created": "2015-01-15T05:00:29Z", + "created_at": "2015-01-15T05:00:29Z", "transferable": "2016-01-28T05:58:28Z", "source": "chrg_test_52u2h7igf601x172g23" }, @@ -25,7 +25,7 @@ "type": "debit", "amount": 192188, "currency": "THB", - "created": "2015-01-15T10:12:25Z", + "created_at": "2015-01-15T10:12:25Z", "location": "/transactions/trxn_test_52u2h7rxsbg06m2nyqb", "transferable": "2016-01-28T05:58:30Z", "source": "chrg_test_52u2h7q6a1fz4msrqdk" diff --git a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yq7duwb9jts1vxgqua-get.json b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yq7duwb9jts1vxgqua-get.json index f8f62d7e..1721929d 100644 --- a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yq7duwb9jts1vxgqua-get.json +++ b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yq7duwb9jts1vxgqua-get.json @@ -4,5 +4,5 @@ "type": "credit", "amount": 96094, "currency": "THB", - "created": "2015-01-15T05:00:29Z" + "created_at": "2015-01-15T05:00:29Z" } diff --git a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqafnvlztbf3908vs1-get.json b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqafnvlztbf3908vs1-get.json index 72eb8bd6..ad25db8d 100644 --- a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqafnvlztbf3908vs1-get.json +++ b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqafnvlztbf3908vs1-get.json @@ -4,5 +4,5 @@ "type": "debit", "amount": 192188, "currency": "THB", - "created": "2015-01-15T10:12:25Z" + "created_at": "2015-01-15T10:12:25Z" } diff --git a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqmv79fzpy0gmz5mmq-get.json b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqmv79fzpy0gmz5mmq-get.json index 9c88a8a3..c381a6a3 100644 --- a/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqmv79fzpy0gmz5mmq-get.json +++ b/testdata/fixtures/api.omise.co/transactions/trxn_test_4yqmv79fzpy0gmz5mmq-get.json @@ -4,5 +4,5 @@ "type": "debit", "amount": 10000, "currency": "THB", - "created": "2015-01-16T07:23:45Z" + "created_at": "2015-01-16T07:23:45Z" } diff --git a/testdata/fixtures/api.omise.co/transfers-get.json b/testdata/fixtures/api.omise.co/transfers-get.json index 367512e9..9c942b66 100644 --- a/testdata/fixtures/api.omise.co/transfers-get.json +++ b/testdata/fixtures/api.omise.co/transfers-get.json @@ -21,7 +21,7 @@ "brand": "test", "last_digits": "6789", "name": "DEFAULT BANK ACCOUNT", - "created": "2015-12-16T05:55:29Z" + "created_at": "2015-12-16T05:55:29Z" }, "currency": "thb", "fee": 3000, @@ -29,7 +29,7 @@ "failure_message": null, "transaction": "trxn_test_4yqafnvlztbf3908vs1", "recipient": "recp_test_50894vc13y8z4v51iuc", - "created": "2016-01-28T06:56:10Z" + "created_at": "2016-01-28T06:56:10Z" }, { "object": "transfer", @@ -42,7 +42,7 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, "sent": false, "paid": false, @@ -52,7 +52,7 @@ "failure_code": null, "failure_message": null, "transaction": null, - "created": "2015-01-15T10:04:47Z" + "created_at": "2015-01-15T10:04:47Z" } ] } diff --git a/testdata/fixtures/api.omise.co/transfers-post.json b/testdata/fixtures/api.omise.co/transfers-post.json index d8201542..7e80bbbc 100644 --- a/testdata/fixtures/api.omise.co/transfers-post.json +++ b/testdata/fixtures/api.omise.co/transfers-post.json @@ -16,7 +16,7 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, - "created": "2015-01-15T10:04:47Z" + "created_at": "2015-01-15T10:04:47Z" } diff --git a/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-get.json b/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-get.json index d8201542..7e80bbbc 100644 --- a/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-get.json +++ b/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-get.json @@ -16,7 +16,7 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, - "created": "2015-01-15T10:04:47Z" + "created_at": "2015-01-15T10:04:47Z" } diff --git a/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-patch.json b/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-patch.json index b8829578..c04a69a2 100644 --- a/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-patch.json +++ b/testdata/fixtures/api.omise.co/transfers/trsf_test_4yqacz8t3cbipcj766u-patch.json @@ -16,7 +16,7 @@ "brand": "test", "last_digits": "6789", "name": "JOHN DOE", - "created": "2015-06-02T09:26:59Z" + "created_at": "2015-06-02T09:26:59Z" }, - "created": "2015-01-15T10:04:47Z" + "created_at": "2015-01-15T10:04:47Z" } diff --git a/testdata/fixtures/vault.omise.co/tokens-post.json b/testdata/fixtures/vault.omise.co/tokens-post.json index ae437fe8..2716c800 100644 --- a/testdata/fixtures/vault.omise.co/tokens-post.json +++ b/testdata/fixtures/vault.omise.co/tokens-post.json @@ -19,7 +19,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, - "created": "2015-01-15T07:03:56Z" + "created_at": "2015-01-15T07:03:56Z" } diff --git a/testdata/fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json b/testdata/fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json index ae437fe8..2716c800 100644 --- a/testdata/fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json +++ b/testdata/fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json @@ -19,7 +19,7 @@ "fingerprint": "sRF/oMw2UQJJp/WbU+2/ZbVzwROjpMf1lyhOHhOqziw=", "name": "JOHN DOE", "security_code_check": true, - "created": "2015-01-15T04:03:40Z" + "created_at": "2015-01-15T04:03:40Z" }, - "created": "2015-01-15T07:03:56Z" + "created_at": "2015-01-15T07:03:56Z" } diff --git a/testdata/objects/account_object.json b/testdata/objects/account_object.json index b9e47977..0f79abf7 100644 --- a/testdata/objects/account_object.json +++ b/testdata/objects/account_object.json @@ -2,5 +2,5 @@ "object": "account", "id": "acct_4x7d2wtqnj2f4klrfsc", "email": "gedeon@gedeon.be", - "created": "2015-05-20T04:57:36Z" + "created_at": "2015-05-20T04:57:36Z" } diff --git a/testdata/objects/balance_object.json b/testdata/objects/balance_object.json index 3480dd5b..fa83b120 100644 --- a/testdata/objects/balance_object.json +++ b/testdata/objects/balance_object.json @@ -1,7 +1,7 @@ { "object": "balance", "livemode": false, - "available": 380470, + "transferable": 380470, "total": 380470, "currency": "thb" } diff --git a/testdata/objects/bank_account_object.json b/testdata/objects/bank_account_object.json index 64a0639c..72e0da77 100644 --- a/testdata/objects/bank_account_object.json +++ b/testdata/objects/bank_account_object.json @@ -1,7 +1,7 @@ { "object": "bank_account", "brand": "bbl", - "number": "1234567890", + "account_number": "1234567890", "name": "SOMCHAI PRASERT", - "created": "2015-02-26T09:56:15Z" + "created_at": "2015-02-26T09:56:15Z" } diff --git a/testdata/objects/card_object.json b/testdata/objects/card_object.json index d0aef7f2..d7835716 100644 --- a/testdata/objects/card_object.json +++ b/testdata/objects/card_object.json @@ -14,5 +14,5 @@ "fingerprint": "mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=", "name": "Somchai Prasert", "security_code_check": true, - "created": "2015-06-02T05:41:46Z" + "created_at": "2015-06-02T05:41:46Z" } diff --git a/testdata/objects/charge_object.json b/testdata/objects/charge_object.json index aaaa2af4..7dccf1df 100644 --- a/testdata/objects/charge_object.json +++ b/testdata/objects/charge_object.json @@ -13,7 +13,7 @@ "authorized": true, "paid": true, "transaction": "trxn_test_5086xltqqbv4qpmu0ri", - "refunded": 0, + "refunded_amount": 0, "installment_terms": 7, "refunds": { "object": "list", @@ -22,9 +22,7 @@ "offset": 0, "limit": 20, "total": 0, - "data": [ - - ], + "data": [], "location": "/charges/chrg_test_5086xlsx4lghk9bpb75/refunds" }, "failure_code": null, @@ -45,11 +43,11 @@ "fingerprint": "mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=", "name": "Somchai Prasert", "security_code_check": true, - "created": "2015-06-02T05:41:46Z" + "created_at": "2015-06-02T05:41:46Z" }, "customer": "cust_test_5086xleuh9ft4bn0ac2", "ip": null, "dispute": null, - "created": "2015-06-02T05:41:49Z", + "created_at": "2015-06-02T05:41:49Z", "paid_at": "2015-06-02T05:41:49Z" } diff --git a/testdata/objects/customer_object.json b/testdata/objects/customer_object.json index c3a7f9bc..934d8682 100644 --- a/testdata/objects/customer_object.json +++ b/testdata/objects/customer_object.json @@ -9,7 +9,7 @@ "metadata": { "hello": "world" }, - "created": "2015-06-02T05:41:47Z", + "created_at": "2015-06-02T05:41:47Z", "cards": { "object": "list", "from": "1970-01-01T00:00:00+00:00", @@ -34,7 +34,7 @@ "fingerprint": "mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=", "name": "Somchai Prasert", "security_code_check": true, - "created": "2015-06-02T05:41:46Z" + "created_at": "2015-06-02T05:41:46Z" } ], "location": "/customers/cust_test_5086xleuh9ft4bn0ac2/cards" diff --git a/testdata/objects/dispute_object.json b/testdata/objects/dispute_object.json index 4ee941e7..eb6e8485 100644 --- a/testdata/objects/dispute_object.json +++ b/testdata/objects/dispute_object.json @@ -8,5 +8,5 @@ "status": "pending", "message": "This is an unauthorized transaction", "charge": "chrg_test_4zgcsiv4s6ewsy8nrw3", - "created": "2015-03-23T05:24:39Z" + "created_at": "2015-03-23T05:24:39Z" } diff --git a/testdata/objects/event_object.json b/testdata/objects/event_object.json index a84f03b4..a1810961 100644 --- a/testdata/objects/event_object.json +++ b/testdata/objects/event_object.json @@ -4,7 +4,7 @@ "livemode": false, "location": "/events/evnt_test_526yctupnje5mbldskd", "key": "transfer.destroy", - "created": "2015-11-30T03:39:42Z", + "created_at": "2015-11-30T03:39:42Z", "data": { "object": "transfer", "id": "trsf_test_526yctqob5djkckq88a", diff --git a/testdata/objects/recipient_object.json b/testdata/objects/recipient_object.json index 55a94155..f9a51173 100644 --- a/testdata/objects/recipient_object.json +++ b/testdata/objects/recipient_object.json @@ -15,8 +15,8 @@ "brand": "bbl", "last_digits": "7890", "name": "SOMCHAI PRASERT", - "created": "2015-06-02T05:41:53Z" + "created_at": "2015-06-02T05:41:53Z" }, "failure_code": null, - "created": "2015-06-02T05:41:53Z" + "created_at": "2015-06-02T05:41:53Z" } diff --git a/testdata/objects/refund_object.json b/testdata/objects/refund_object.json index f0da3733..ccd7f91c 100644 --- a/testdata/objects/refund_object.json +++ b/testdata/objects/refund_object.json @@ -6,5 +6,5 @@ "currency": "thb", "charge": "chrg_test_5086xlsx4lghk9bpb75", "transaction": "trxn_test_5086xm1mbshmohdhk00", - "created": "2015-06-02T05:41:50Z" + "created_at": "2015-06-02T05:41:50Z" } diff --git a/testdata/objects/token_object.json b/testdata/objects/token_object.json index 907133a8..a4f6dd0e 100644 --- a/testdata/objects/token_object.json +++ b/testdata/objects/token_object.json @@ -19,7 +19,7 @@ "fingerprint": "mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=", "name": "Somchai Prasert", "security_code_check": true, - "created": "2015-06-02T05:41:46Z" + "created_at": "2015-06-02T05:41:46Z" }, - "created": "2015-06-02T05:41:46Z" + "created_at": "2015-06-02T05:41:46Z" } diff --git a/testdata/objects/transaction_object.json b/testdata/objects/transaction_object.json index 61c8aabb..61699cca 100644 --- a/testdata/objects/transaction_object.json +++ b/testdata/objects/transaction_object.json @@ -4,5 +4,5 @@ "type": "credit", "amount": 96094, "currency": "THB", - "created": "2015-06-02T05:34:54Z" + "created_at": "2015-06-02T05:34:54Z" } diff --git a/testdata/objects/transfer_object.json b/testdata/objects/transfer_object.json index 7e456738..f8fd2404 100644 --- a/testdata/objects/transfer_object.json +++ b/testdata/objects/transfer_object.json @@ -9,7 +9,7 @@ "brand": "test", "last_digits": "6789", "name": "DEFAULT BANK ACCOUNT", - "created": "2015-05-30T04:28:09Z" + "created_at": "2015-05-30T04:28:09Z" }, "sent": false, "paid": false, @@ -18,5 +18,5 @@ "failure_code": null, "failure_message": null, "transaction": null, - "created": "2015-06-02T05:34:13Z" + "created_at": "2015-06-02T05:34:13Z" }