Skip to content

Commit 6ab5656

Browse files
committed
Merge remote-tracking branch 'upstream/master' into resource-rate-limit-fix-pr
2 parents 35402cf + e9fbdbc commit 6ab5656

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

lib/ApplicationCharge.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,9 @@ class ApplicationCharge extends ShopifyResource
2121
* @inheritDoc
2222
*/
2323
public $countEnabled = false;
24-
}
24+
25+
// To activate ApplicationCharge
26+
protected $customPostActions = array(
27+
'activate',
28+
);
29+
}

lib/CurlRequest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ protected static function init($url, $httpHeaders = array())
4949
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
5050

5151
curl_setopt($ch, CURLOPT_HEADER, true);
52+
curl_setopt($ch, CURLOPT_USERAGENT, 'PHPClassic/PHPShopify');
5253

5354
$headers = array();
5455
foreach ($httpHeaders as $key => $value) {

lib/PriceRule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace PHPShopify;
1111

1212

13-
/*
13+
/**
1414
* --------------------------------------------------------------------------
1515
* PriceRule -> Child Resources
1616
* --------------------------------------------------------------------------

lib/ShopifySDK.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
* @property-read Customer $Customer
7575
* @property-read CustomerSavedSearch $CustomerSavedSearch
7676
* @property-read Discount $Discount
77+
* @property-read PriceRule $PriceRule
7778
* @property-read Event $Event
7879
* @property-read FulfillmentService $FulfillmentService
7980
* @property-read GiftCard $GiftCard
@@ -107,6 +108,7 @@
107108
* @method Customer Customer(integer $id = null)
108109
* @method CustomerSavedSearch CustomerSavedSearch(integer $id = null)
109110
* @method Discount Discount(integer $id = null)
111+
* @method PriceRule PriceRule(integer $id = null)
110112
* @method Event Event(integer $id = null)
111113
* @method FulfillmentService FulfillmentService(integer $id = null)
112114
* @method GiftCard GiftCard(integer $id = null)

0 commit comments

Comments
 (0)