+ @if ($order->billing_address || $order->shipping_address)
+
diff --git a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
index ce0a1a7f2..e43dd10f2 100644
--- a/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
+++ b/packages/Webkul/BookingProduct/src/Repositories/BookingProductEventTicketRepository.php
@@ -2,6 +2,7 @@
namespace Webkul\BookingProduct\Repositories;
+use Illuminate\Support\Facades\Event;
use Webkul\Core\Eloquent\Repository;
use Illuminate\Support\Str;
@@ -18,12 +19,16 @@ class BookingProductEventTicketRepository extends Repository
}
/**
- * @param array $data
- * @param \Webkul\BookingProduct\Contracts\BookingProduct $bookingProduct
+ * @param array $data
+ * @param \Webkul\BookingProduct\Contracts\BookingProduct $bookingProduct
+ *
* @return void
+ * @throws \Prettus\Validator\Exceptions\ValidatorException
*/
- public function saveEventTickets($data, $bookingProduct)
+ public function saveEventTickets($data, $bookingProduct): void
{
+ Event::dispatch('booking_product.booking.event-ticket.save.before', ['data' => $data, 'bookingProduct' => $bookingProduct]);
+
$previousTicketIds = $bookingProduct->event_tickets()->pluck('id');
if (isset($data['tickets'])) {
@@ -54,7 +59,7 @@ class BookingProductEventTicketRepository extends Repository
}
if (Str::contains($ticketId, 'ticket_')) {
- $this->create(array_merge([
+ $ticket = $this->create(array_merge([
'booking_product_id' => $bookingProduct->id,
], $ticketInputs));
} else {
@@ -62,13 +67,18 @@ class BookingProductEventTicketRepository extends Repository
$previousTicketIds->forget($index);
}
- $this->update($ticketInputs, $ticketId);
+ $ticket = $this->update($ticketInputs, $ticketId);
}
+
+ $savedTickets[$ticketId]['ticket'] = $ticket;
+ $savedTickets[$ticketId]['ticketInputs'] = $ticketInputs;
}
}
foreach ($previousTicketIds as $previousTicketId) {
$this->delete($previousTicketId);
}
+
+ Event::dispatch('booking_product.booking.event-ticket.save.after', ['tickets' => $savedTickets]);
}
}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
index 31d7476ef..e327d76e0 100644
--- a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
+++ b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
@@ -7,8 +7,11 @@ namespace Webkul\Core\Helpers;
use Faker\Factory;
use Codeception\Module\Laravel5;
+use Webkul\BookingProduct\Models\BookingProduct;
+use Webkul\BookingProduct\Models\BookingProductEventTicket;
use Webkul\Checkout\Models\Cart;
use Webkul\Checkout\Models\CartItem;
+use Webkul\Customer\Models\Customer;
use Webkul\Product\Models\Product;
use Webkul\Attribute\Models\Attribute;
use Webkul\Checkout\Models\CartAddress;
@@ -31,21 +34,19 @@ class Laravel5Helper extends Laravel5
public const SIMPLE_PRODUCT = 1;
public const VIRTUAL_PRODUCT = 2;
public const DOWNLOADABLE_PRODUCT = 3;
+ public const BOOKING_EVENT_PRODUCT = 4;
/**
* Returns the field name of the given attribute in which a value should be saved inside
* the 'product_attribute_values' table. Depends on the type.
*
- * @param string $attribute
+ * @param string $type
*
* @return string|null
* @part ORM
*/
public static function getAttributeFieldName(string $type): ?string
{
-
- $attributes = [];
-
$possibleTypes = [
'text' => 'text_value',
'select' => 'integer_value',
@@ -60,7 +61,7 @@ class Laravel5Helper extends Laravel5
public function prepareCart(array $options = []): array
{
- $faker = \Faker\Factory::create();
+ $faker = Factory::create();
$I = $this;
@@ -108,7 +109,7 @@ class Laravel5Helper extends Laravel5
$cartItems = [];
- $generatedCartItems = rand(3, 10);
+ $generatedCartItems = random_int(3, 10);
for ($i = 2; $i <= $generatedCartItems; $i++) {
$quantity = random_int(1, 10);
@@ -178,6 +179,10 @@ class Laravel5Helper extends Laravel5
$I = $this;
switch ($productType) {
+ case self::BOOKING_EVENT_PRODUCT:
+ $product = $I->haveBookingEventProduct($configs, $productStates);
+ break;
+
case self::DOWNLOADABLE_PRODUCT:
$product = $I->haveDownloadableProduct($configs, $productStates);
break;
@@ -205,7 +210,6 @@ class Laravel5Helper extends Laravel5
$productStates = array_merge($productStates, ['simple']);
}
- /** @var Product $product */
$product = $I->createProduct($configs['productAttributes'] ?? [], $productStates);
$I->createAttributeValues($product->id, $configs['attributeValues'] ?? []);
@@ -222,7 +226,6 @@ class Laravel5Helper extends Laravel5
$productStates = array_merge($productStates, ['virtual']);
}
- /** @var Product $product */
$product = $I->createProduct($configs['productAttributes'] ?? [], $productStates);
$I->createAttributeValues($product->id, $configs['attributeValues'] ?? []);
@@ -239,7 +242,6 @@ class Laravel5Helper extends Laravel5
$productStates = array_merge($productStates, ['downloadable']);
}
- /** @var Product $product */
$product = $I->createProduct($configs['productAttributes'] ?? [], $productStates);
$I->createAttributeValues($product->id, $configs['attributeValues'] ?? []);
@@ -249,6 +251,22 @@ class Laravel5Helper extends Laravel5
return $product->refresh();
}
+ private function haveBookingEventProduct(array $configs = [], array $productStates = []): Product
+ {
+ $I = $this;
+ if (! in_array('booking', $productStates)) {
+ $productStates = array_merge($productStates, ['booking']);
+ }
+
+ $product = $I->createProduct($configs['productAttributes'] ?? [], $productStates);
+
+ $I->createAttributeValues($product->id, $configs['attributeValues'] ?? []);
+
+ $I->createBookingEventProduct($product->id);
+
+ return $product->refresh();
+ }
+
private function createProduct(array $attributes = [], array $states = []): Product
{
return factory(Product::class)->states($states)->create($attributes);
@@ -275,6 +293,18 @@ class Laravel5Helper extends Laravel5
]);
}
+ private function createBookingEventProduct(int $productId): void
+ {
+ $I = $this;
+ $bookingProduct = $I->have(BookingProduct::class, [
+ 'product_id' => $productId,
+ ]);
+
+ $I->have(BookingProductEventTicket::class, [
+ 'booking_product_id' => $bookingProduct->id,
+ ]);
+ }
+
private function createAttributeValues(int $productId, array $attributeValues = []): void
{
$I = $this;
@@ -295,7 +325,7 @@ class Laravel5Helper extends Laravel5
}
- /** @var array $defaultAttributeValues
+ /**
* Some defaults that should apply to all generated products.
* By defaults products will be generated as saleable.
* If you do not want this, this defaults can be overriden by $attributeValues.
@@ -314,7 +344,7 @@ class Laravel5Helper extends Laravel5
'special_price' => null,
'price' => $faker->randomFloat(2, 1, 1000),
'weight' => '1.00', // necessary for shipping
- 'brand' => AttributeOption::firstWhere('attribute_id', $brand->id)->id,
+ 'brand' => AttributeOption::query()->firstWhere('attribute_id', $brand->id)->id,
];
$attributeValues = array_merge($defaultAttributeValues, $attributeValues);
diff --git a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
index 2e9109127..b33721b83 100755
--- a/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
+++ b/packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
@@ -156,7 +156,7 @@ class CustomerController extends Controller
$orders = $customerRepository->all_orders->whereIn('status', ['pending', 'processing'])->first();
if ($orders) {
- session()->flash('error', trans('admin::app.response.order-pending'));
+ session()->flash('error', trans('admin::app.response.order-pending', ['name' => 'Customer']));
return redirect()->route($this->_config['redirect']);
} else {
diff --git a/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php b/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php
index c12f36e97..28ce81693 100644
--- a/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php
+++ b/packages/Webkul/Customer/src/Notifications/CustomerUpdatePassword.php
@@ -11,16 +11,16 @@ class CustomerUpdatePassword extends Mailable
use Queueable, SerializesModels;
/**
- * The admin instance.
+ * The customer instance.
*
- * @var \Webkul\User\Contracts\Admin $admin
+ * @var \Webkul\Customer\Models\Customer $customer
*/
public $customer;
/**
* Create a new message instance.
*
- * @param \Webkul\User\Contracts\Admin $admin
+ * @param \Webkul\Customer\Models\Customer $customer
* @return void
*/
public function __construct($customer)
diff --git a/packages/Webkul/Customer/src/Repositories/CustomerRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerRepository.php
index 1dc4c9ea5..1e853476a 100755
--- a/packages/Webkul/Customer/src/Repositories/CustomerRepository.php
+++ b/packages/Webkul/Customer/src/Repositories/CustomerRepository.php
@@ -16,4 +16,36 @@ class CustomerRepository extends Repository
{
return 'Webkul\Customer\Contracts\Customer';
}
+
+ /**
+ * Check if customer has order pending or processing.
+ *
+ * @param Webkul\Customer\Models\Customer
+ * @return boolean
+ */
+ public function checkIfCustomerHasOrderPendingOrProcessing($customer)
+ {
+ return $customer->all_orders->pluck('status')->contains(function ($val) {
+ return $val === 'pending' || $val === 'processing';
+ });
+ }
+
+ /**
+ * Check if bulk customers, if they have order pending or processing.
+ *
+ * @param array
+ * @return boolean
+ */
+ public function checkBulkCustomerIfTheyHaveOrderPendingOrProcessing($customerIds)
+ {
+ foreach ($customerIds as $customerId) {
+ $customer = $this->findorFail($customerId);
+
+ if ($this->checkIfCustomerHasOrderPendingOrProcessing($customer)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Database/Factories/ProductFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductFactory.php
index e07b3169e..d0f4240b8 100644
--- a/packages/Webkul/Product/src/Database/Factories/ProductFactory.php
+++ b/packages/Webkul/Product/src/Database/Factories/ProductFactory.php
@@ -6,12 +6,8 @@ use Faker\Generator as Faker;
use Webkul\Product\Models\Product;
$factory->define(Product::class, function (Faker $faker) {
- $now = date("Y-m-d H:i:s");
-
return [
'sku' => $faker->uuid,
- 'created_at' => $now,
- 'updated_at' => $now,
'attribute_family_id' => 1,
];
});
@@ -26,4 +22,8 @@ $factory->state(Product::class, 'virtual', [
$factory->state(Product::class, 'downloadable', [
'type' => 'downloadable',
+]);
+
+$factory->state(Product::class, 'booking', [
+ 'type' => 'booking',
]);
\ No newline at end of file
diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php
index 32df169f6..8f90a3b55 100755
--- a/packages/Webkul/Sales/src/Models/Order.php
+++ b/packages/Webkul/Sales/src/Models/Order.php
@@ -277,6 +277,12 @@ class Order extends Model implements OrderContract
return false;
}
+ foreach ($this->invoices as $item) {
+ if ($item->state == "pending" || $item->state == "overdue") {
+ return false;
+ }
+ }
+
foreach ($this->items as $item) {
if ($item->qty_to_refund > 0) {
return true;
diff --git a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
index 8f4f605e6..70a3882ca 100755
--- a/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
@@ -97,7 +97,7 @@ class InvoiceRepository extends Repository
$invoice = $this->model->create([
'order_id' => $order->id,
'total_qty' => $totalQty,
- 'state' => 'paid',
+ 'state' => 'pending',
'base_currency_code' => $order->base_currency_code,
'channel_currency_code' => $order->channel_currency_code,
'order_currency_code' => $order->order_currency_code,
@@ -106,7 +106,7 @@ class InvoiceRepository extends Repository
foreach ($data['invoice']['items'] as $itemId => $qty) {
if (! $qty) {
- continue;
+ continue;
}
$orderItem = $this->orderItemRepository->find($itemId);
@@ -192,11 +192,8 @@ class InvoiceRepository extends Repository
}
$this->collectTotals($invoice);
-
$this->orderRepository->collectTotals($order);
- $this->orderRepository->updateOrderStatus($order);
-
Event::dispatch('sales.invoice.save.after', $invoice);
} catch (\Exception $e) {
DB::rollBack();
@@ -256,4 +253,16 @@ class InvoiceRepository extends Repository
return $invoice;
}
+
+ /**
+ * @param \Webkul\Sales\Contracts\Invoice $invoice
+ * @return void
+ */
+ public function updateInvoiceState($invoice, $status)
+ {
+ $invoice->state = $status;
+ $invoice->save();
+
+ return true;
+ }
}
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
index e6c2259ea..1f2b36dcc 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/grouped-products.blade.php
@@ -10,22 +10,24 @@
{{ __('shop::app.products.qty') }}
@foreach ($product->grouped_products as $groupedProduct)
-
-
- {{ $groupedProduct->associated_product->name }}
+ @if($groupedProduct->associated_product->getTypeInstance()->isSaleable())
+
+
+ {{ $groupedProduct->associated_product->name }}
- @include ('shop::products.price', ['product' => $groupedProduct->associated_product])
-
+ @include ('shop::products.price', ['product' => $groupedProduct->associated_product])
+
-
-
-
-
-
+
+
+
+
+
+ @endif
@endforeach
diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
index 845658344..b1875d9a9 100644
--- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
+++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php
@@ -8,22 +8,9 @@
@push('scripts')