Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated
This commit is contained in:
shubhammehrotra.symfony@webkul.com
commit
fccfbededb
|
|
@ -2,13 +2,63 @@
|
|||
|
||||
#### This changelog consists the bug & security fixes and new features being included in the releases listed below.
|
||||
|
||||
## **v1.0.0-BETA2(13th of February 2020)** - *Release*
|
||||
|
||||
* #2377 [fixed] - Getting exception on creating a new category under any other category.
|
||||
|
||||
* #2378 [fixed] - Exception when adding velocity content page list.
|
||||
|
||||
* #2381 [fixed] - Fix UI for linked product (related/upsell/cross sell).
|
||||
|
||||
* #2382 [fixed] - If customer use shipping address other than billing address then also its showing the billing address in shipping address section.
|
||||
|
||||
* #2384 [fixed] - Vat id validation rule was changed, since then test action has failed.
|
||||
|
||||
* #2386 [fixed] - bundle product details in cart page should contains item details.
|
||||
|
||||
* #2388 [fixed] - order placed with blank billing address.
|
||||
|
||||
* #2390 [fixed] - Add hyphen in Orders->Information section of customer.
|
||||
|
||||
* #2391 [fixed] - toogle footer configuration is always true in velocity.
|
||||
|
||||
* #2393 [fixed] - Getting exception on adding grouped product to cart.
|
||||
|
||||
* #2395 [fixed] - Can not add grouped product in cart more than one time, getting error message.
|
||||
|
||||
* #2397 [fixed] - Company Name field is not available in Billing Address form in velocity theme.
|
||||
|
||||
* #2398 [fixed] - Mark all mandatory field in customer's billing address form.
|
||||
|
||||
* #2399 [fixed] - Layout issue in bundle product.
|
||||
|
||||
* #2400 [fixed] - Whole product price should be in bold in bundle product.
|
||||
|
||||
* #2403 [fixed] - Ratings icons show in category product view list for 0 rating.
|
||||
|
||||
* #2410 [fixed] - error button update cart.
|
||||
|
||||
* #2417 [fixed] - Inactive payment method or shipping method are showing in velocity footer content.
|
||||
|
||||
* #2424 [fixed] - Exception on frontend when default currency is not selected in currencies.
|
||||
|
||||
* #2436 [fixed] - error velocity/meta-data.
|
||||
|
||||
* #2438 [fixed] - Add hyphen - with cart discount amount.
|
||||
|
||||
* #2439 [fixed] - can't process for further checkout steps until all the address line filled.
|
||||
|
||||
* #2440 [fixed] - Advertisement Three Images is not working.
|
||||
|
||||
* #2449 [fixed] - error clicking empty cart.
|
||||
|
||||
## **v1.0.0-BETA1(5th of February 2020)** - *Release*
|
||||
|
||||
* [feature] Updated to laravel version 6.
|
||||
|
||||
* [feature] Added four new product types - Group, Bundle, Downloadable and Virtaul.
|
||||
* [feature] Added four new product types - Group, Bundle, Downloadable and Virtual.
|
||||
|
||||
* [feature] Povided default theme (Velocity).
|
||||
* [feature] Provided new theme (Velocity).
|
||||
|
||||
* #1971 [fixed] - Filter is not working properly for id column in autogenerated coupon codes in cart rule.
|
||||
|
||||
|
|
@ -196,6 +246,8 @@
|
|||
|
||||
* #2280 [fixed] - Getting small checkbox on refreshing the product page.
|
||||
|
||||
* #2281 [fixed] - In minicart, whole minicart container is showing clickable but only image section gets clicked to redirect to product page.
|
||||
|
||||
* #2282 [fixed] - Not getting any validation error message if current date of birth is selected in customer profile.
|
||||
|
||||
* #2285 [fixed] - Layout issue if category length is large.
|
||||
|
|
@ -248,8 +300,4 @@
|
|||
|
||||
* #2366 [fixed] - Not able to add logo for category, after saving the category logo gets removed.
|
||||
|
||||
* #2371 [fixed] - Getting exception on updating Category.
|
||||
|
||||
* #2280 [fixed] - In minicart, whole minicart container is showing clickable but only image section gets clicked to redirect to product page.
|
||||
|
||||
* #2281 [fixed] - In minicart, whole minicart container is showing clickable but only image section gets clicked to redirect to product page.
|
||||
* #2371 [fixed] - Getting exception on updating Category.
|
||||
|
|
@ -47,8 +47,9 @@ It packs in lots of features that will allow your E-Commerce business to scale i
|
|||
* Multistore Inventory System.
|
||||
* Orders Management System.
|
||||
* Customer Cart, Wishlist, Product Reviews.
|
||||
* Simple and Configurable Products.
|
||||
* Simple, Configurable, Group, Bundle, Downloadable and Virtual Products.
|
||||
* Price rules (Discount) inbuilt.
|
||||
* Theme (Velocity).
|
||||
* CMS Pages.
|
||||
* Check out [these features and more](https://bagisto.com/features/).
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,8 @@ $factory->define(Order::class, function (Faker $faker) {
|
|||
'channel_id' => 1,
|
||||
'channel_type' => Channel::class,
|
||||
'cart_id' => 0,
|
||||
'shipping_method' => 'free_free',
|
||||
'shipping_title' => 'Free Shipping',
|
||||
];
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ $factory->define(OrderItem::class, function (Faker $faker) {
|
|||
},
|
||||
'created_at' => $now,
|
||||
'updated_at' => $now,
|
||||
'product_type' => Product::class,
|
||||
];
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,14 @@ use Faker\Generator as Faker;
|
|||
use Illuminate\Support\Facades\DB;
|
||||
use Webkul\Sales\Models\OrderPayment;
|
||||
|
||||
$factory->define(OrderPayment::class, function (Faker $faker) {
|
||||
$now = date("Y-m-d H:i:s");
|
||||
$factory->define(OrderPayment::class, function (Faker $faker, array $attributes) {
|
||||
|
||||
if (!array_key_exists('order_id', $attributes)) {
|
||||
throw new InvalidArgumentException('order_id must be provided.');
|
||||
}
|
||||
|
||||
return [
|
||||
'created_at' => $now,
|
||||
'updated_at' => $now,
|
||||
'method' => 'cashondelivery',
|
||||
];
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@
|
|||
|
||||
|
||||
{!! view_render_event('bagisto.shop.checkout.cart-mini.item.options.before', ['item' => $item]) !!}
|
||||
|
||||
|
||||
@if (isset($item->additional['attributes']))
|
||||
<div class="item-options">
|
||||
|
||||
|
||||
@foreach ($item->additional['attributes'] as $attribute)
|
||||
<b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
|
||||
@endforeach
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
|
||||
@else
|
||||
|
||||
<div class="dropdown-toggle">
|
||||
<div class="dropdown-toggle" style="pointer-events: none;">
|
||||
<div style="display: inline-block; cursor: pointer;">
|
||||
<span class="icon cart-icon"></span>
|
||||
<span class="name">{{ __('shop::app.minicart.cart') }}<span class="count"> ({{ __('shop::app.minicart.zero') }}) </span></span>
|
||||
|
|
|
|||
|
|
@ -75,6 +75,16 @@ class ConfigurationController extends Controller
|
|||
foreach ($params['images'] as $index => $images) {
|
||||
$params['advertisement'][$index] = $this->uploadAdvertisementImages($images, $index, $advertisement);
|
||||
}
|
||||
|
||||
if ( $advertisement ) {
|
||||
foreach ($advertisement as $key => $image_array) {
|
||||
if (! isset($params['images'][$key])) {
|
||||
foreach ($advertisement[$key] as $image) {
|
||||
Storage::delete($image);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($params['product_view_images'])) {
|
||||
|
|
@ -104,21 +114,28 @@ class ConfigurationController extends Controller
|
|||
public function uploadAdvertisementImages($data, $index, $advertisement)
|
||||
{
|
||||
$save_image = [];
|
||||
|
||||
$save_data = $advertisement;
|
||||
|
||||
foreach ($data as $imageId => $image) {
|
||||
$file = 'images.' . $index . '.' . $imageId;
|
||||
$dir = 'velocity/images';
|
||||
|
||||
if (Str::contains($imageId, 'image_')) {
|
||||
if ( Str::contains($imageId, 'image_') ) {
|
||||
if (request()->hasFile($file) && $image) {
|
||||
Storage::delete($dir . $file);
|
||||
|
||||
$save_image[substr($imageId, 6, 1)] = request()->file($file)->store($dir);
|
||||
$filter_index = substr($imageId, 6, 1);
|
||||
if ( isset($data[$filter_index]) ) {
|
||||
$size = array_key_last($save_data[$index]);
|
||||
|
||||
$save_image[$size + 1] = request()->file($file)->store($dir);
|
||||
} else {
|
||||
$save_image[substr($imageId, 6, 1)] = request()->file($file)->store($dir);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ( isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId]) {
|
||||
if ( isset($advertisement[$index][$imageId]) && $advertisement[$index][$imageId] && !request()->hasFile($file)) {
|
||||
$save_image[$imageId] = $advertisement[$index][$imageId];
|
||||
unset($advertisement[$index][$imageId]);
|
||||
|
||||
unset($advertisement[$index][$imageId]);
|
||||
}
|
||||
|
||||
if (request()->hasFile($file) && isset($advertisement[$index][$imageId])) {
|
||||
|
|
@ -132,7 +149,6 @@ class ConfigurationController extends Controller
|
|||
if ( isset($advertisement[$index]) && $advertisement[$index]) {
|
||||
foreach ($advertisement[$index] as $imageId) {
|
||||
Storage::delete($imageId);
|
||||
$save_image[$imageId] = '';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ class GuestCheckoutCest
|
|||
$this->faker = Factory::create();
|
||||
|
||||
$pConfigDefault = [
|
||||
'productInventory' => ['qty' => $this->faker->randomNumber(2)],
|
||||
'productInventory' => ['qty' => $this->faker->numberBetween(1, 1000)],
|
||||
'attributeValues' => [
|
||||
'status' => true,
|
||||
'new' => 1,
|
||||
|
|
@ -27,7 +27,7 @@ class GuestCheckoutCest
|
|||
],
|
||||
];
|
||||
$pConfigGuestCheckout = [
|
||||
'productInventory' => ['qty' => $this->faker->randomNumber(2)],
|
||||
'productInventory' => ['qty' => $this->faker->numberBetween(1, 1000)],
|
||||
'attributeValues' => [
|
||||
'status' => true,
|
||||
'new' => 1,
|
||||
|
|
|
|||
Loading…
Reference in New Issue