@foreach(core()->getAllChannels() as $channel)
-
@foreach($channel->locales as $locale)
@@ -393,7 +393,6 @@
use_coupon: null,
// auto_generation: 0,
usage_limit: 0,
- is_guest: 0,
action_type: null,
apply: null,
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index d4c333028..861fd674f 100755
--- a/packages/Webkul/Core/src/Core.php
+++ b/packages/Webkul/Core/src/Core.php
@@ -596,6 +596,16 @@ class Core
return $coreConfigValue->value;
}
+ /**
+ * Retrieve a group of information from the core config table
+ *
+ * @return array
+ */
+ public function retrieveGroupConfig($criteria)
+ {
+ return $criteria;
+ }
+
/**
* Retrieve all countries
*
diff --git a/packages/Webkul/Discount/src/Actions/FixedAmount.php b/packages/Webkul/Discount/src/Actions/FixedAmount.php
index a46ae6ecd..8ff965281 100644
--- a/packages/Webkul/Discount/src/Actions/FixedAmount.php
+++ b/packages/Webkul/Discount/src/Actions/FixedAmount.php
@@ -8,7 +8,7 @@ class FixedAmount extends Action
{
public function calculate($rule, $item, $cart)
{
- //calculate discount amount
+ // calculate discount amount
$action_type = $rule->action_type; // action type used
$disc_threshold = $rule->disc_threshold; // atleast quantity by default 1 --> may be omitted in near future
$disc_amount = $rule->disc_amount; // value of discount
@@ -18,7 +18,7 @@ class FixedAmount extends Action
$realQty = $item['quantity'];
- if ($cart >= $disc_threshold) {
+ if ($cart->items_qty >= $disc_threshold) {
$amountDiscounted = $disc_amount;
if ($realQty > $disc_quantity) {
diff --git a/packages/Webkul/Discount/src/Config/rule-conditions.php b/packages/Webkul/Discount/src/Config/rule-conditions.php
index c881b7dc1..99d170b7a 100644
--- a/packages/Webkul/Discount/src/Config/rule-conditions.php
+++ b/packages/Webkul/Discount/src/Config/rule-conditions.php
@@ -34,7 +34,7 @@ return [
'actions' => [
'percent_of_product' => 'Percentage of product',
'fixed_amount' => 'Apply as fixed amount',
- 'buy_a_get_b' => 'Get B amount back',
+ 'buy_a_get_b' => 'Buy A get B'
],
'validation' => [
diff --git a/packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php b/packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php
new file mode 100644
index 000000000..a34fe12d9
--- /dev/null
+++ b/packages/Webkul/Discount/src/Database/Migrations/2019_06_25_110122_remove_is_guest_from_cart_rules_table.php
@@ -0,0 +1,32 @@
+dropColumn('is_guest');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('cart_rules', function (Blueprint $table) {
+ $table->boolean('is_guest')->default(0);
+ });
+ }
+}
diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php
index 852307862..4f239d198 100644
--- a/packages/Webkul/Discount/src/Helpers/Discount.php
+++ b/packages/Webkul/Discount/src/Helpers/Discount.php
@@ -92,8 +92,10 @@ abstract class Discount
}
}
} else {
- if ($rule->is_guest) {
- $customerGroupBased = true;
+ foreach ($rule->customer_groups as $customer_group) {
+ if ($customer_group->customer_group->code == 'guest') {
+ $customerGroupBased = true;
+ }
}
}
@@ -317,6 +319,29 @@ abstract class Discount
}
}
+ /**
+ * Retreives all the payment methods from application config
+ *
+ * @return array
+ */
+ public function getPaymentMethods()
+ {
+ $paymentMethods = config('paymentmethods');
+
+ return $paymentMethods;
+ }
+
+ /**
+ * Retreives all the shippin methods from the application config
+ *
+ * @return array
+ */
+ public function getShippingMethods()
+ {
+ $shippingMethods = config('carriers');
+
+ return $shippingMethods;
+ }
/**
* Checks the rule against the current cart instance whether rule conditions are applicable
@@ -326,39 +351,67 @@ abstract class Discount
*/
protected function testIfAllConditionAreTrue($conditions, $cart)
{
+ $paymentMethods = $this->getPaymentMethods();
+
+ $shippingMethods = $this->getShippingMethods();
+
array_pop($conditions);
- $shipping_address = $cart->getShippingAddressAttribute() ?? '';
+ $shipping_address = $cart->getShippingAddressAttribute() ?? null;
- $shipping_method = $cart->shipping_method ?? '';
- $shipping_country = $shipping_address->country ?? '';
- $shipping_state = $shipping_address->state ?? '';
- $shipping_postcode = $shipping_address->postcode ?? '';
- $shipping_city = $shipping_address->city ?? '';
+ $shipping_method = $cart->selected_shipping_rate->method_title ?? null;
+
+ $shipping_country = $shipping_address->country ?? null;
+
+ $shipping_state = $shipping_address->state ?? null;
+
+ $shipping_postcode = $shipping_address->postcode ?? null;
+
+ $shipping_city = $shipping_address->city ?? null;
+
+ $payment_method = $paymentMethods[$cart->payment->method]['title'];
- $payment_method = $cart->payment->method ?? '';
$sub_total = $cart->base_sub_total;
$total_items = $cart->items_qty;
+
$total_weight = 0;
- foreach($cart->items as $item) {
+ foreach ($cart->items as $item) {
$total_weight = $total_weight + $item->base_total_weight;
}
$result = true;
foreach ($conditions as $condition) {
- if (isset($condition->attribute))
+ if (isset($condition->attribute)) {
$actual_value = ${$condition->attribute};
- if (isset($condition->value))
+ } else {
+ $result = false;
+ }
+
+ if (isset($condition->value)) {
$test_value = $condition->value;
- if (isset($condition->condition))
+ } else {
+ $result = false;
+ }
+
+ if (isset($condition->condition)) {
$test_condition = $condition->condition;
+ }
+ else {
+ $result = false;
+ }
if (isset($condition->type) && ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text')) {
+ if ($condition->type == 'string') {
+ $actual_value = strtolower($actual_value);
+
+ $test_value = strtolower($test_value);
+ }
+
if ($test_condition == '=') {
if ($actual_value != $test_value) {
$result = false;
@@ -414,23 +467,34 @@ abstract class Discount
*
* @return boolean
*/
- protected function testIfAnyConditionIsTrue($conditions, $cart) {
+ protected function testIfAnyConditionIsTrue($conditions, $cart)
+ {
+ $paymentMethods = $this->getPaymentMethods();
+
+ $shippingMethods = $this->getShippingMethods();
+
array_pop($conditions);
$result = false;
- $shipping_address = $cart->getShippingAddressAttribute() ?? '';
+ $shipping_address = $cart->getShippingAddressAttribute() ?? null;
- $shipping_method = $cart->shipping_method ?? '';
- $shipping_country = $shipping_address->country ?? '';
- $shipping_state = $shipping_address->state ?? '';
- $shipping_postcode = $shipping_address->postcode ?? '';
- $shipping_city = $shipping_address->city ?? '';
+ $shipping_method = $cart->selected_shipping_rate->method_title ?? null;
+
+ $shipping_country = $shipping_address->country ?? null;
+
+ $shipping_state = $shipping_address->state ?? null;
+
+ $shipping_postcode = $shipping_address->postcode ?? null;
+
+ $shipping_city = $shipping_address->city ?? null;
+
+ $payment_method = $paymentMethods[$cart->payment->method]['title'];
- $payment_method = $cart->payment->method ?? '';
$sub_total = $cart->base_sub_total;
$total_items = $cart->items_qty;
+
$total_weight = 0;
foreach($cart->items as $item) {
@@ -438,11 +502,34 @@ abstract class Discount
}
foreach ($conditions as $condition) {
- $actual_value = ${$condition->attribute};
- $test_value = $condition->value;
- $test_condition = $condition->condition;
+ if (isset($condition->attribute)) {
+ $actual_value = ${$condition->attribute};
+
+ } else {
+ $result = false;
+ }
+
+ if (isset($condition->value)) {
+ $test_value = $condition->value;
+
+ } else {
+ $result = false;
+ }
+
+ if (isset($condition->condition)) {
+ $test_condition = $condition->condition;
+ }
+ else {
+ $result = false;
+ }
if ($condition->type == 'numeric' || $condition->type == 'string' || $condition->type == 'text') {
+ if ($condition->type == 'string') {
+ $actual_value = strtolower($actual_value);
+
+ $test_value = strtolower($test_value);
+ }
+
if ($test_condition == '=') {
if ($actual_value == $test_value) {
$result = true;
diff --git a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
index 7f7cbb4de..b747860fe 100644
--- a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
+++ b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
@@ -36,15 +36,14 @@ class NonCouponAbleRule extends Discount
'cart_id' => $cart->id,
]);
-
if (count($alreadyAppliedCartRuleCart)) {
$alreadyAppliedRule = $alreadyAppliedCartRuleCart->first()->cart_rule;
$validated = $this->validateRule($alreadyAppliedRule);
- if (! $alreadyAppliedRule->use_coupon && ! $validated) {
+ if (! $validated) {
// if the validation fails then the cart rule gets deleted from cart rule cart
- $alreadyAppliedRule->delete();
+ $alreadyAppliedCartRuleCart->first()->delete();
// all discount is cleared fro mthe cart and cart items table
$this->clearDiscount();
@@ -68,10 +67,25 @@ class NonCouponAbleRule extends Discount
$impact = $actionInstance->calculate($rule, $item, $cart);
- array_push($applicableRules, [
- 'rule' => $rule,
- 'impact' => $impact
- ]);
+ if ($impact['discount'] > 0) {
+ array_push($applicableRules, [
+ 'rule' => $rule,
+ 'impact' => $impact
+ ]);
+ }
+
+ if (count($alreadyAppliedCartRuleCart)) {
+ $alreadyAppliedRule = $alreadyAppliedCartRuleCart->first()->cart_rule;
+
+ if ($alreadyAppliedRule->id == $rule->id) {
+ if ($impact['discount'] == 0) {
+ $alreadyAppliedCartRuleCart->first()->delete();
+
+ // all discount is cleared from cart and cart items table
+ $this->clearDiscount();
+ }
+ }
+ }
}
}
diff --git a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
index 64d99d3c0..a3e70fee4 100644
--- a/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
+++ b/packages/Webkul/Discount/src/Models/CartRuleCustomerGroups.php
@@ -3,6 +3,7 @@
namespace Webkul\Discount\Models;
use Illuminate\Database\Eloquent\Model;
+use Webkul\Customer\Moels\CustomerGroupProxy;
use Webkul\Discount\Contracts\CartRuleCustomerGroups as CartRuleCustomerGroupContract;
class CartRuleCustomerGroups extends Model implements CartRuleCustomerGroupContract
@@ -10,4 +11,9 @@ class CartRuleCustomerGroups extends Model implements CartRuleCustomerGroupContr
protected $table = 'cart_rule_customer_groups';
protected $guarded = ['created_at', 'updated_at'];
+
+ public function customer_group()
+ {
+ return $this->hasOne(CustomerGroupProxy::modelClass());
+ }
}
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index 521af556b..2ba29bc61 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -486,7 +486,9 @@
coupon_code: null,
- error_message: ''
+ error_message: null,
+
+ couponChanged: false
}
},
@@ -517,15 +519,23 @@
axios.post('{{ route('shop.checkout.check.coupons') }}', {code: this_this.coupon_code})
.then(function(response) {
- this_this.$emit('onApplyCoupon')
+ this_this.$emit('onApplyCoupon');
+
+ this_this.couponChanged = true;
})
.catch(function(error) {
- window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}];
+ this_this.couponChanged = true;
- this_this.$root.addFlashMessages();
+ this_this.error_message = error.response.data.message;
});
},
+ changeCoupon: function() {
+ if (this.couponChanged == true) {
+ this.couponChanged = false;
+ }
+ },
+
removeCoupon: function () {
var this_this = this;
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
index 01de2b767..20098085f 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
@@ -50,13 +50,12 @@