@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -9,8 +9,4 @@ |
||
| 9 | 9 | class IzbergCart extends IzbergClient |
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | -<<<<<<< HEAD |
|
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
| 12 | +<< << <<< HEAD |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/cart/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -9,8 +9,4 @@ |
||
| 9 | 9 | class IzbergOrder extends IzbergClient |
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | -<<<<<<< HEAD |
|
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
| 12 | +<< << <<< HEAD |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/order/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -9,8 +9,4 @@ |
||
| 9 | 9 | class IzbergUser extends IzbergClient |
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | -<<<<<<< HEAD |
|
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
| 12 | +<< << <<< HEAD |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -10,7 +10,3 @@ |
||
| 10 | 10 | { |
| 11 | 11 | protected static $url = 'v1/user/'; |
| 12 | 12 | <<<<<<< HEAD |
| 13 | -} |
|
| 14 | -======= |
|
| 15 | -} |
|
| 16 | ->>>>>>> 60508b8848c0977a9f9f73f2e8db3c91a48127bc |
|
@@ -109,8 +109,8 @@ |
||
| 109 | 109 | $message_auth = hash_hmac('sha1', implode(";", $toCompose), $secretKey); |
| 110 | 110 | |
| 111 | 111 | $url = $this->izbergUrl; |
| 112 | - $url .= 'first_name=' . urlencode($firstName) . '&last_name=' . urlencode($lastName) . '&message_auth=' . $message_auth . '&email=' . urlencode($email); |
|
| 113 | - $url .= '×tamp=' . $timestamp . '&is_staff=true'; |
|
| 112 | + $url .= 'first_name='.urlencode($firstName).'&last_name='.urlencode($lastName).'&message_auth='.$message_auth.'&email='.urlencode($email); |
|
| 113 | + $url .= '×tamp='.$timestamp.'&is_staff=true'; |
|
| 114 | 114 | return $url; |
| 115 | 115 | } |
| 116 | 116 | |