Skip to content

Commit c962666

Browse files
ghassanighassani
committed
1.1.0
1 parent cbf976f commit c962666

File tree

171 files changed

+654
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+654
-173
lines changed

‎CHANGELOG

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
v1.1.0
2+
- Added support for PriceGroupCustomer_ListLoad_Query
3+
- Fixed base64 decoding issues when no padding exists
14
v1.0.0
25
- Initial Release

‎MerchantAPI.xcodeproj/project.pbxproj

+12
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@
220220
A3C294A1221CA80800A186B6 /* OrderPaymentAuthorize.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C294A0221CA80800A186B6 /* OrderPaymentAuthorize.swift */; };
221221
A3E43CA222286F4B006E65A5 /* Encodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3E43CA122286F4B006E65A5 /* Encodable.swift */; };
222222
A3E43CA6222E0057006E65A5 /* RequestBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3E43CA5222E0057006E65A5 /* RequestBuilder.swift */; };
223+
A3EF1D9222FB7BE00063A08B /* PriceGroupCustomer.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EF1D9122FB7BE00063A08B /* PriceGroupCustomer.swift */; };
224+
A3EF1D9422FB7D0C0063A08B /* PriceGroupCustomerListLoadQueryRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EF1D9322FB7D0C0063A08B /* PriceGroupCustomerListLoadQueryRequest.swift */; };
225+
A3EF1D9622FB7D370063A08B /* PriceGroupCustomerListLoadQueryResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EF1D9522FB7D370063A08B /* PriceGroupCustomerListLoadQueryResponse.swift */; };
223226
/* End PBXBuildFile section */
224227

225228
/* Begin PBXFileReference section */
@@ -449,6 +452,9 @@
449452
A3E43C8F2224ABF3006E65A5 /* UpdateProductInventoryExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateProductInventoryExample.swift; sourceTree = "<group>"; };
450453
A3E43CA122286F4B006E65A5 /* Encodable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = "<group>"; };
451454
A3E43CA5222E0057006E65A5 /* RequestBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestBuilder.swift; sourceTree = "<group>"; };
455+
A3EF1D9122FB7BE00063A08B /* PriceGroupCustomer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PriceGroupCustomer.swift; sourceTree = "<group>"; };
456+
A3EF1D9322FB7D0C0063A08B /* PriceGroupCustomerListLoadQueryRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PriceGroupCustomerListLoadQueryRequest.swift; sourceTree = "<group>"; };
457+
A3EF1D9522FB7D370063A08B /* PriceGroupCustomerListLoadQueryResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PriceGroupCustomerListLoadQueryResponse.swift; sourceTree = "<group>"; };
452458
/* End PBXFileReference section */
453459

454460
/* Begin PBXFrameworksBuildPhase section */
@@ -580,6 +586,7 @@
580586
A356EEF822026CE10048CD5F /* OrderShipmentListUpdateResponse.swift */,
581587
A356EF1622026CE10048CD5F /* OrderUpdateCustomerInformationResponse.swift */,
582588
A3C2949A221CA7B500A186B6 /* PaymentMethodListLoadResponse.swift */,
589+
A3EF1D9522FB7D370063A08B /* PriceGroupCustomerListLoadQueryResponse.swift */,
583590
A356EEFB22026CE10048CD5F /* PriceGroupCustomerUpdateAssignedResponse.swift */,
584591
A356EEF522026CE10048CD5F /* PriceGroupListLoadQueryResponse.swift */,
585592
A356EF2C22026CE10048CD5F /* PriceGroupProductListLoadQueryResponse.swift */,
@@ -642,6 +649,7 @@
642649
A3C29489221CA72B00A186B6 /* PaymentCardType.swift */,
643650
A3C29488221CA72B00A186B6 /* PaymentMethod.swift */,
644651
A356EF6222026CE20048CD5F /* PriceGroup.swift */,
652+
A3EF1D9122FB7BE00063A08B /* PriceGroupCustomer.swift */,
645653
A356EF5E22026CE20048CD5F /* PriceGroupProduct.swift */,
646654
A356EF3A22026CE20048CD5F /* PrintQueue.swift */,
647655
A356EF3022026CE20048CD5F /* PrintQueueJob.swift */,
@@ -733,6 +741,7 @@
733741
A356EF7922026CE20048CD5F /* OrderShipmentListUpdateRequest.swift */,
734742
A356EF8322026CE20048CD5F /* OrderUpdateCustomerInformationRequest.swift */,
735743
A3C29492221CA78200A186B6 /* PaymentMethodListLoadRequest.swift */,
744+
A3EF1D9322FB7D0C0063A08B /* PriceGroupCustomerListLoadQueryRequest.swift */,
736745
A356EFA722026CE20048CD5F /* PriceGroupCustomerUpdateAssignedRequest.swift */,
737746
A356EF9F22026CE20048CD5F /* PriceGroupListLoadQueryRequest.swift */,
738747
A356EF7F22026CE20048CD5F /* PriceGroupProductListLoadQueryRequest.swift */,
@@ -879,6 +888,7 @@
879888
A356EFE022026CE30048CD5F /* OrderPaymentRefundResponse.swift in Sources */,
880889
A356EFC122026CE30048CD5F /* OrderShipmentListUpdateResponse.swift in Sources */,
881890
A356EFE422026CE30048CD5F /* ProductImageAddResponse.swift in Sources */,
891+
A3EF1D9622FB7D370063A08B /* PriceGroupCustomerListLoadQueryResponse.swift in Sources */,
882892
A356F04722026CE30048CD5F /* CustomerUpdateRequest.swift in Sources */,
883893
A356F02A22026CE30048CD5F /* PriceGroup.swift in Sources */,
884894
A356F03422026CE30048CD5F /* Version.swift in Sources */,
@@ -1021,6 +1031,7 @@
10211031
A356EFE522026CE30048CD5F /* AvailabilityGroupPaymentMethodUpdateAssignedResponse.swift in Sources */,
10221032
A356F05522026CE30048CD5F /* NoteUpdateRequest.swift in Sources */,
10231033
A356F05722026CE30048CD5F /* PrintQueueJobInsertRequest.swift in Sources */,
1034+
A3EF1D9222FB7BE00063A08B /* PriceGroupCustomer.swift in Sources */,
10241035
A356EFDE22026CE30048CD5F /* NoteDeleteResponse.swift in Sources */,
10251036
A3C2949C221CA7B500A186B6 /* PrintQueueJobStatusResponse.swift in Sources */,
10261037
A356F04422026CE30048CD5F /* CustomerPaymentCardRegisterRequest.swift in Sources */,
@@ -1052,6 +1063,7 @@
10521063
A356F06622026CE30048CD5F /* ProductListLoadQueryRequest.swift in Sources */,
10531064
A356F02022026CE30048CD5F /* Product.swift in Sources */,
10541065
A356EFC722026CE30048CD5F /* OrderCreateResponse.swift in Sources */,
1066+
A3EF1D9422FB7D0C0063A08B /* PriceGroupCustomerListLoadQueryRequest.swift in Sources */,
10551067
A356F05B22026CE30048CD5F /* OrderItemUpdateRequest.swift in Sources */,
10561068
A356F05122026CE30048CD5F /* ProductDeleteRequest.swift in Sources */,
10571069
A356EFC622026CE30048CD5F /* CouponListLoadQueryResponse.swift in Sources */,

‎MerchantAPI/Client.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* For the full copyright and license information, please view the LICENSE
77
* file that was distributed with this source code.
88
*
9-
* $Id: Client.swift 73766 2019-03-05 17:33:13Z gidriss $
9+
* $Id: Client.swift 76813 2019-07-10 22:11:48Z gidriss $
1010
*/
1111

1212
import Foundation
@@ -264,8 +264,8 @@ public class Client {
264264
var key = key
265265

266266
if key.count > 0 {
267-
if (key.count % 4 != 0){
268-
key += String(repeating: "=", count: (key.count % 4))
267+
if (key.count % 4 != 0) {
268+
key += String(repeating: "=", count: (4 - (key.count % 4)))
269269
}
270270

271271
self.signingKey = Data(base64Encoded: key) ?? Data()

‎MerchantAPI/Model/AvailabilityGroup.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: AvailabilityGroup.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Category.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Category.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CategoryProduct.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CategoryProduct.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Coupon.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Coupon.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CouponPriceGroup.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CouponPriceGroup.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CustomFieldValues.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CustomFieldValues.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Customer.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Customer.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CustomerAddress.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CustomerAddress.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CustomerPaymentCard.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CustomerPaymentCard.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/CustomerPriceGroup.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: CustomerPriceGroup.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/DiscountModuleCapabilities.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: DiscountModuleCapabilities.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Module.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Module.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Note.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Note.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/Order.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: Order.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderCharge.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderCharge.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderCoupon.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderCoupon.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderCustomField.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderCustomField.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderDiscountTotal.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderDiscountTotal.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderItem.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderItem.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderItemAttribute.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderItemAttribute.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderItemDiscount.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderItemDiscount.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderItemOption.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderItemOption.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderItemSubscription.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderItemSubscription.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderPayment.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderPayment.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderPaymentAuthorize.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderPaymentAuthorize.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderPaymentTotal.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderPaymentTotal.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderProduct.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderProduct.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderProductAttribute.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderProductAttribute.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderShipment.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderShipment.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderShipmentUpdate.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderShipmentUpdate.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/OrderTotal.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: OrderTotal.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/PaymentCardType.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: PaymentCardType.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

‎MerchantAPI/Model/PaymentMethod.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* For the full copyright and license information, please view the LICENSE
55
* file that was distributed with this source code.
66
*
7-
* $Id: PaymentMethod.swift 73952 2019-03-07 22:36:32Z gidriss $
7+
* $Id$
88
*/
99

1010
import Foundation

0 commit comments

Comments
 (0)