From de5c9f349fb20cf69144a1e8cb527f6a2bdb0d19 Mon Sep 17 00:00:00 2001 From: Amber Dixon Date: Tue, 13 Jun 2017 13:44:52 -0700 Subject: [PATCH] Rename merchant_id to location_id --- .../Base.lproj/HelloCharge-Swift.storyboard | 71 +++++------ .../HelloChargeSwiftTableViewController.swift | 6 +- HelloCharge/Base.lproj/HelloCharge.storyboard | 58 ++++----- HelloCharge/HelloChargeTableViewController.m | 6 +- Podfile.lock | 4 +- .../NSError+SCCAPIAdditionsTests.swift | 13 ++ .../SCCAPIConnectionTests.m | 4 +- .../SCCAPIRequestTests.swift | 115 ++++++++++++++---- SquarePointOfSaleSDK.podspec | 2 +- .../NSError+SCCAPIAdditions.h | 3 +- .../NSError+SCCAPIAdditions.m | 23 ++-- .../NSError+SCCAPISerializationAdditions.h | 7 +- .../SCCAPIRequest+Serialization.h | 2 +- SquarePointOfSaleSDK/SCCAPIRequest.h | 40 ++++-- SquarePointOfSaleSDK/SCCAPIRequest.m | 39 ++++-- 15 files changed, 253 insertions(+), 140 deletions(-) diff --git a/HelloCharge-Swift/Base.lproj/HelloCharge-Swift.storyboard b/HelloCharge-Swift/Base.lproj/HelloCharge-Swift.storyboard index 1a0df14..ab8e882 100644 --- a/HelloCharge-Swift/Base.lproj/HelloCharge-Swift.storyboard +++ b/HelloCharge-Swift/Base.lproj/HelloCharge-Swift.storyboard @@ -1,5 +1,5 @@ - + @@ -18,10 +18,10 @@ - + - + - - + @@ -47,10 +46,10 @@ - + - + - - + @@ -79,10 +77,10 @@ - + - + - + - + - + - + - + - +