Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow nullable variant id in Product Complex Rule Conditions #210

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Allow nullable variant id in Product Complex Rule Conditions #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a1bc3a3
Complex Rule Condition Null Variant ID
qadeersahmed May 7, 2023
3fad3eb
Merge pull request #1 from qadeersahmed/qadeersahmed-patch-1
qadeersahmed May 7, 2023
751c4f4
Update PriceAdjuster
qadeersahmed May 7, 2023
8ea0b1d
Update WeightAdjuster
qadeersahmed May 7, 2023
c036092
Update PriceAdjuster
qadeersahmed May 7, 2023
8f228da
Update WeightAdjuster
qadeersahmed May 7, 2023
0d32d2e
Update ResourceModel
qadeersahmed May 7, 2023
7175553
Update ResourceModel
qadeersahmed May 7, 2023
bcb1bb0
Update PriceAdjuster
qadeersahmed May 7, 2023
3459b21
Update WeightAdjuster
qadeersahmed May 7, 2023
e9dc5e9
Merge branch 'main' into qadeersahmed-patch-1
qadeersahmed May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BigCommerce/ResourceModels/Catalog/Product/ComplexRuleConditions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ class ComplexRuleConditions extends ResourceModel
public int $rule_id;
public int $modifier_id;
public int $modifier_value_id;
public array $variant_id;
public ?int $variant_id;
public int $combination_id;
}
9 changes: 9 additions & 0 deletions src/BigCommerce/ResourceModels/Catalog/Product/PriceAdjuster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,13 @@ class PriceAdjuster extends ResourceModel

public string $adjuster;
public float $adjuster_value;

protected function beforeBuildObject(): void
{
if (!is_null($this->optionObject)) {
if(is_null($this->optionObject->adjuster)){
$this->optionObject->adjuster = self::ADJUSTER_FIXED;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this to handle the case of BigCommerce not returning the adjuster property?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this will handle when BigCommerce is not returning adjuster property.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is usally not returning adjuster property when in store front we have fixed type of adjuster.

}
}
}
}
12 changes: 12 additions & 0 deletions src/BigCommerce/ResourceModels/Catalog/Product/WeightAdjuster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@

class WeightAdjuster extends ResourceModel
{
public const ADJUSTER_RELATIVE = 'relative';
public const ADJUSTER_FIXED = 'fixed';

public string $adjuster;
public float $adjuster_value;

protected function beforeBuildObject(): void
{
if (!is_null($this->optionObject)) {
if(is_null($this->optionObject->adjuster)){
$this->optionObject->adjuster = self::ADJUSTER_FIXED;
}
}
}
}
2 changes: 1 addition & 1 deletion src/BigCommerce/ResourceModels/ResourceModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

abstract class ResourceModel implements JsonSerializable
{
private ?stdClass $optionObject;
protected ?stdClass $optionObject;

public function __construct(?stdClass $optionObject = null)
{
Expand Down