Commit Graph

2325 Commits

Author SHA1 Message Date
Sanjay d3e7d6210f Fixex header-translation-issues 2022-02-24 12:02:17 +05:30
Sanjay 875a9efe40 Issue #5855 Fixed 2022-02-23 16:50:04 +05:30
Sanjay 03e9be2c35 Complete changes 2022-02-23 14:54:03 +05:30
Sanjay 048139c0b2 issue #5865 fixed 2022-02-23 10:33:30 +05:30
merdan 84d77539e9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
2022-02-22 17:50:56 +05:00
prateek srivastava 97c0be5f88 fixed ui for rtl-notification-search 2022-02-21 19:59:52 +05:30
prateek srivastava bcc4cf629b issue #5809 fixed 2022-02-21 19:45:08 +05:30
prateek srivastava a7c7ae789b issue #5828 fixed 2022-02-21 14:40:35 +05:30
Glenn Hermans 8d7a2518b0
Merge pull request #5843 from Sanjaybhattwebkul/add-astric-icon
Issue #5840 Fixed
2022-02-18 13:50:57 +01:00
Sanjay 7516a4eac1 AstricIcon-added 2022-02-18 18:04:39 +05:30
Sanjay ec56a86842 notification-translation-issue-fixed 2022-02-18 15:19:01 +05:30
prateek srivastava 6844aee49e issue #5835 fixed 2022-02-17 19:15:42 +05:30
prateek srivastava c28995ccbb issue #5803 fixed 2022-02-17 11:02:22 +05:30
prateek srivastava 23666466f4 issue #5803 fixed 2022-02-16 13:34:09 +05:30
prateek srivastava bdc29b455e issue #5808 fixed 2022-02-16 13:11:24 +05:30
Devansh 36bdad4304 Multiple Flash Messages Fixed 2022-02-11 19:18:21 +05:30
Devansh 9d99fdf186 All Destroy Method Updated 2022-02-11 18:04:38 +05:30
Deepak Singh Gusain 6f0f4cae85 resolve conflicts 2022-02-11 10:23:28 +05:30
Devansh fc5e58b7a8
Merge pull request #5771 from kideny/master
add zh_CN language
2022-02-10 20:25:26 +05:30
kideny 3713fad54f add more files 2022-02-10 21:59:54 +08:00
Deepak Singh Gusain 3d86db36bd Fixed date related issue 2022-02-10 16:25:01 +05:30
Deepak Singh Gusain 13ebcdd649 resolve conflicts 2022-02-10 15:34:06 +05:30
Devansh 8fb29e4cdc
Merge pull request #5782 from devansh-webkul/reverted-file
Reverted One Address Index File #5774
2022-02-10 14:57:13 +05:30
Devansh 5e1c8203ee Reverted Index File 2022-02-10 13:09:30 +05:30
Deepak Singh Gusain f3b6cd67ce Fixed the calender issue at mobile view 2022-02-10 11:59:23 +05:30
Deepak Singh Gusain 825d7aa991 Fixed dashboard ui issue 2022-02-10 10:54:02 +05:30
Deepak Singh Gusain 4de476a940 Mobile view Layout shifting issue 2022-02-10 10:28:22 +05:30
Deepak Singh Gusain d9372834cd Fixed Layout shifting admin panel 2022-02-10 10:13:31 +05:30
Devansh 393b749650 Message Updated 2022-02-08 18:51:21 +05:30
Devansh 329cf9c08c Merge branch 'master' into datagrid-plus-trait 2022-02-08 17:12:00 +05:30
Devansh 46ccea3118 Fixed Typo 2022-02-08 16:24:08 +05:30
Devansh 33015405aa Fixed Cart Rule Coupon Creation 2022-02-08 15:35:30 +05:30
Devansh 5bb56f708c Datagrid Trait Plus Added And Test Case Improved 2022-02-07 16:06:38 +05:30
merdan 91b7e84cb6 Merge branch 'master' of https://github.com/bagisto/bagisto into dev
 Conflicts:
	packages/Webkul/Core/src/Core.php
	packages/Webkul/Product/src/Models/ProductImage.php
2022-02-05 14:43:51 +05:00
Devansh 22933b19a5 Merge branch 'master' into optional-fields-checkout 2022-02-03 18:32:42 +05:30
Devansh a4559d6fb9
Merge pull request #5737 from devansh-webkul/draggable-images-enhancement 2022-02-03 18:28:49 +05:30
Devansh 6d8ef13120 Variant Images Handled 2022-02-03 17:44:45 +05:30
Devansh 3b91f5edbd Video Draggable Feature Added 2022-02-03 14:08:34 +05:30
merdan 3ccddbf443 category filters 2022-02-03 13:34:16 +05:00
Devansh ff1f77fe8e Suspend Customer Ability Added In Admin 2022-02-02 15:47:09 +05:30
Devansh 8c800bc925 Some Validations Updated 2022-02-02 13:04:39 +05:30
Deepak Singh Gusain d70d06a495 Fixed ui issue of booking product admin panel 2022-02-02 12:59:30 +05:30
Devansh 5317fedd21 Positions Updated 2022-02-02 12:09:29 +05:30
Devansh c9a4a6c4f1 Added Migration And Position And Updated Image Repository 2022-02-01 20:34:28 +05:30
Devansh 836f3679b1 Vue Draggable Added 2022-02-01 18:18:55 +05:30
Devansh c9b60b2c10 Squashed All Commits 2022-02-01 16:44:16 +05:30
merdan 690a33710f Merge branch 'master' of https://github.com/bagisto/bagisto into dev
 Conflicts:
	.env.example
	README.md
	composer.json
	composer.lock
	config/app.php
	config/scout.php
	packages/Webkul/API/Http/Controllers/Shop/AddressController.php
	packages/Webkul/API/Http/Resources/Checkout/Cart.php
	packages/Webkul/API/Http/Resources/Sales/Order.php
	packages/Webkul/API/Http/routes.php
	packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
	packages/Webkul/Core/src/Resources/lang/fa/validation.php
	packages/Webkul/Core/src/Resources/lang/it/app.php
	packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
	packages/Webkul/Core/src/Resources/lang/tr/app.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
	packages/Webkul/Velocity/publishable/assets/js/components.js
	packages/Webkul/Velocity/publishable/assets/js/manifest.js
	public/installer/Classes/Requirement.php
2022-02-01 15:01:06 +05:00
Glenn Hermans 235294c042
Merge pull request #5725 from devansh-webkul/duplicate-invoice
Duplicate Invoice Ability Added #5525
2022-01-31 16:34:09 +01:00
Devansh a02a1e23ad Select Option Text Added 2022-01-31 17:54:05 +05:30
Devansh 4e62451d49 Duplicate Invoice Ability Added 2022-01-31 17:43:35 +05:30
Deepak Singh Gusain 99732c18c6 fixed conflicts 2022-01-25 17:35:39 +05:30
Deepak Singh Gusain c2f9a14e4b responsive velocity header 2022-01-25 17:01:38 +05:30
Deepak Singh Gusain 38d1f41ab1 Fixed the ui issue of button overlap 2022-01-25 16:31:20 +05:30
Deepak Singh Gusain 069f288ec5 hover issue at nav har 2022-01-25 16:25:23 +05:30
Deepak Singh Gusain 69044a7b85 formatted scss 2022-01-25 16:07:47 +05:30
Deepak Singh Gusain b3d5cd1e18 Fixed header ui issue 2022-01-25 16:02:17 +05:30
Deepak Singh Gusain 64809c47b3 resolve the conflicts , merge master and some changes in navbar 2022-01-25 11:33:32 +05:30
Deepak Singh Gusain 65b2721403 Merge branch 'master' into cms-redirect-issue 2022-01-24 18:39:20 +05:30
Deepak Singh Gusain cee7c3a085 Fixed issue of cms redirect 2022-01-24 18:37:40 +05:30
Deepak Singh Gusain d206346995 Dark Mode Pending color issue 2022-01-24 12:43:51 +05:30
Deepak Singh Gusain b5c54d4f85 fixed conflicts 2022-01-21 19:46:51 +05:30
Deepak Singh Gusain c16e124cc5 resolve conflicts 2022-01-21 19:29:58 +05:30
Devansh d7a4d48e17
Merge pull request #5618 from deepaksinghgusain227/update-style-navbar-notification
some style changes for notification and navbar
2022-01-21 18:55:20 +05:30
Devansh db94d4f3e1 Property Name Change 2022-01-21 17:12:21 +05:30
Devansh d697e70402
Update ProductCategoryUniqueSlug.php 2022-01-21 17:01:24 +05:30
Deepak Singh Gusain 5a82c501a6 recompile assets 2022-01-21 15:30:42 +05:30
Devansh 9bcff0ef15 Slug Bug Fixed 2022-01-21 15:21:19 +05:30
Deepak Singh Gusain afc72fecbd rtl with mobile view 2022-01-21 15:17:31 +05:30
Deepak Singh Gusain 786075045d fixed conflicts at nav left 2022-01-21 14:19:32 +05:30
Deepak Singh Gusain 227d2157fa resloved conflicts 2022-01-21 12:42:19 +05:30
Deepak Singh Gusain 2cb8af2b27 resolved conflicts 2022-01-21 12:06:10 +05:30
Deepak Singh Gusain b8c80b337b created varibles for the hardcoded color 2022-01-21 11:50:12 +05:30
Deepak Singh Gusain 9c3905e5d1 Merge branch 'master' into update-style-navbar-notification 2022-01-21 10:37:42 +05:30
Deepak Singh Gusain 7a15b10951 icon issue 2022-01-20 19:32:13 +05:30
Deepak Singh Gusain b8cc78e971 Fixed the issue of sidebar only one tab at one time issue 2022-01-20 19:27:32 +05:30
Deepak Singh Gusain 841693b7de resolved Confilicts 2022-01-20 16:40:43 +05:30
Deepak Singh Gusain d2dde1ccc2 Navigation bar 2022-01-20 16:38:06 +05:30
Devansh 9d09e79533
Merge pull request #5658 from deepaksinghgusain227/navbar-top-account-ui
Fixed Admin Account Ui issue
2022-01-20 14:59:52 +05:30
Deepak Singh Gusain 732a7f83b1 work on locale-icon 2022-01-20 14:39:56 +05:30
Devansh fd1de0f48e
Merge pull request #5656 from devansh-webkul/added-support
Enhancement Done For Invoice PDF
2022-01-20 11:15:14 +05:30
Deepak Singh Gusain 2e85c41c69 Fixed Admin Account Ui issue 2022-01-20 11:12:13 +05:30
Deepak Singh Gusain 65260abdff resolved conflicts 2022-01-20 10:35:52 +05:30
Deepak Singh Gusain a639f503d0 resolved conflicts 2022-01-20 10:32:25 +05:30
Devansh 41b0d284b9 Enhanced PDF 2022-01-19 23:36:04 +05:30
Devansh c89120cc4d Fixed Euro Currency Support 2022-01-19 20:43:28 +05:30
Deepak Singh Gusain e475f8a05c Fixed Locale Issue 2022-01-19 17:52:13 +05:30
Deepak Singh Gusain 98a89fa0da Fixed multi select ui issue 2022-01-19 10:19:11 +05:30
Deepak Singh Gusain 65c0723014 fixed conflicts 2022-01-19 09:55:34 +05:30
Glenn Hermans 2577714d76
Merge pull request #5639 from deepaksinghgusain227/notification-tooltip
fixed when we hover over bell icon tooltip is not showing
2022-01-18 15:14:41 +01:00
Deepak Singh Gusain a3d74c8531 added notification-title in place of title 2022-01-18 18:49:43 +05:30
Deepak Singh Gusain b4c9938e9c merge master 2022-01-18 18:44:16 +05:30
Deepak Singh Gusain 8e3d6667f9 formatted scss 2022-01-18 18:41:26 +05:30
Deepak Singh Gusain 1cbd3524cc add scss for rtl and normal direction 2022-01-18 18:34:44 +05:30
Deepak Singh Gusain 7d38c0aedd changes in nl translation 2022-01-18 18:15:25 +05:30
Deepak Singh Gusain 95ff54505c turkish translation added for notification 2022-01-18 18:01:14 +05:30
Deepak Singh Gusain cdbb3484f8 portuguese translation added for notification 2022-01-18 17:57:31 +05:30
Deepak Singh Gusain 4efa5daa3f polish translation added for notification 2022-01-18 17:52:56 +05:30
Deepak Singh Gusain d5ef4d61b0 dutch translation added for notification 2022-01-18 17:49:56 +05:30
Deepak Singh Gusain b50afe02a7 italian translation added for notification 2022-01-18 17:45:49 +05:30
Deepak Singh Gusain c7e9c74d47 Finnish translation added for notification 2022-01-18 17:41:21 +05:30
Deepak Singh Gusain d258189a11 Persian translation added for notification 2022-01-18 17:37:18 +05:30
Deepak Singh Gusain 3ea98daf30 Spanish translation added for notification 2022-01-18 17:31:06 +05:30
Deepak Singh Gusain 5aa5185e04 german translation added for notification 2022-01-18 17:14:25 +05:30
Deepak Singh Gusain b8e8913f26 Notification arabic translation added 2022-01-18 17:06:00 +05:30
Deepak Singh Gusain 7860f23ffa formatted code 2022-01-18 16:33:10 +05:30
Deepak Singh Gusain bbfe5ab57e add space 2022-01-18 15:17:15 +05:30
Deepak Singh Gusain e1a1d1d821 Fixed Dark mode color issue 2022-01-18 15:14:57 +05:30
Deepak Singh Gusain 999026d538 fixed conflicts 2022-01-18 15:01:56 +05:30
Deepak Singh Gusain 0f316e78fe Fixed New admin theme - RTL menu 2022-01-18 14:57:47 +05:30
Deepak Singh Gusain eb353e6f1a fixed when we hover over bell icon tooltip is not showing 2022-01-18 14:02:41 +05:30
Deepak Singh Gusain 253c759669 fixed Conflicts 2022-01-18 13:48:27 +05:30
Deepak Singh Gusain c1339c9002 add color varibale 2022-01-18 13:38:50 +05:30
Deepak Singh Gusain 71ff1f49ac fixed ui issu of switch button at dark mode 2022-01-18 13:14:54 +05:30
Devansh 09a9b1f1db Moved Locale Images To Core 2022-01-17 19:41:20 +05:30
Deepak Singh Gusain c55303aa8a some style changes for notification and navbar 2022-01-14 17:12:59 +05:30
Deepak Singh Gusain f55f760b33 Fixed catalog header ui issue 2022-01-14 16:37:35 +05:30
Deepak Singh Gusain eeb114d978 fixed cart-rule catalog-rule condition ui 2022-01-14 15:51:48 +05:30
Deepak Singh Gusain 4c95488bc9 Fixed Mark as Read Issue 2022-01-13 18:40:32 +05:30
Deepak Singh Gusain 666525f8c8 Fixed the ui header issue 2022-01-13 16:33:11 +05:30
Deepak Singh Gusain 14bbc6e3b4 color issue solved in dark theme 2022-01-13 15:09:42 +05:30
Deepak Singh Gusain ced5b4f1ae fixed dashboard readability 2022-01-13 15:03:18 +05:30
Glenn Hermans 9e9dacfa4e
Merge pull request #5597 from deepaksinghgusain227/cms-page-header-ui-issue
fixed cms header ui issue
2022-01-13 08:58:26 +01:00
Deepak Singh Gusain 3d8275eebd fixed cms header ui issue 2022-01-13 13:05:20 +05:30
Deepak Singh Gusain b77f180312 fixed conflicts 2022-01-13 12:50:54 +05:30
Deepak Singh Gusain ff4d682143 deprecation issue 2022-01-13 12:03:44 +05:30
Deepak Singh Gusain b3321a7bea fixed Category header ui 2022-01-13 11:33:53 +05:30
Deepak Singh Gusain bc9e6bfcdf compiled css/js 2022-01-11 17:17:26 +05:30
Deepak Singh Gusain 38f5d9a79c
Merge branch 'bagisto:master' into overlap-expand-icon-issue 2022-01-11 16:19:09 +05:30
Deepak Singh Gusain af74a8f9bf fixed the issue of overlapping 2022-01-11 16:18:41 +05:30
Devansh 0bf0ab1f72 Some More Events Moved 2022-01-10 20:51:59 +05:30
Devansh 62ddf53d16 Merge branch 'master' of github.com:devansh-webkul/bagisto 2022-01-10 20:21:48 +05:30
Devansh 8f67109880 Some Events Placed Inside The Repository 2022-01-10 20:21:30 +05:30
Glenn Hermans 162363df63 fixed customers views 2022-01-08 10:33:37 +01:00
Glenn Hermans 59de5a2c60 updated theme 2022-01-07 21:31:59 +01:00
Glenn Hermans 0459ba7d6e updated theme 2022-01-07 19:18:39 +01:00
Glenn Hermans d597fe08c1 Merge branch 'admin' of github.com:bagisto-europe/bagisto into admin 2022-01-07 18:18:16 +01:00
Glenn Hermans 6fb40482b0 updated theme 2022-01-07 18:18:06 +01:00
Glenn Hermans 67a31abc2d
Merge pull request #5554 from bagisto-europe/admin
darkmode updated
2022-01-07 07:46:54 +01:00
Devansh 7a64b8a008
Merge pull request #5557 from devansh-webkul/admin-attribute-family 2022-01-07 11:33:53 +05:30
Devansh 79e770d898
Merge pull request #5558 from devansh-webkul/custommer-group
Customer Group Price Fixed #5553
2022-01-07 11:33:17 +05:30
Devansh 63ac2bcf17
Merge pull request #5560 from devansh-webkul/translations
Translations Added #5549
2022-01-07 11:32:28 +05:30
Devansh fff092adf4 Version Improvement 2022-01-07 11:11:50 +05:30
Devansh e623a11649 Translations Added 2022-01-07 10:32:14 +05:30
Devansh 156ca2975c Customer Group Price Fixed 2022-01-07 10:22:25 +05:30
Devansh fac9ef933a Removed Blank Space 2022-01-07 09:58:00 +05:30
Glenn Hermans 45df797d53 init progress on fixing static colors 2022-01-07 00:53:25 +01:00
Glenn Hermans a761f01660 changed brand color to blue 2022-01-07 00:52:38 +01:00
Glenn Hermans 318470bbe3 init progress on removing static colors 2022-01-07 00:17:09 +01:00
Glenn Hermans 7d4574ee98 fixed typo 2022-01-07 00:16:29 +01:00
Devansh 43ce4b47b0 Mass Operation Request Added And Some Clean Up Done 2022-01-06 16:53:28 +05:30
Devansh f3902b94a3 Fixed With Proper Consistensy 2022-01-06 09:37:26 +05:30
Devansh 1312274f8f Added Translation In Create Also 2022-01-05 19:27:37 +05:30
Devansh 376237af4b Select Gender Added 2022-01-05 19:21:58 +05:30
Devansh f0ac527b48 Status Updated 2022-01-05 18:20:27 +05:30
Deepak Singh Gusain 2209ecc1e5 remove console.log in notification.vue 2022-01-03 16:56:10 +05:30
deepaksinghgusain227 30dffa3cc7
Merge branch 'bagisto:master' into new-theme 2022-01-03 16:32:24 +05:30
Deepak Singh Gusain ea66c3f723 Work on Testing part, fixed the ui part and add translation for notification 2022-01-03 16:31:00 +05:30
Deepak Singh Gusain 9c4a52401e fixed the date icon issue 2022-01-03 12:52:09 +05:30
Devansh a4e6ed1945 Inventory Sources Validation Added 2022-01-03 11:21:34 +05:30
Deepak Singh Gusain 7f3b71c0c0 work on ui part 2021-12-31 18:27:34 +05:30
Deepak Singh Gusain de746ed6b8 working on notification part 2021-12-30 20:18:00 +05:30
Deepak Singh Gusain 38306a444d New Theme Work Done 2021-12-30 19:00:13 +05:30
Devansh eae09f195c Channel Code Fixed 2021-12-29 13:58:33 +05:30
Glenn Hermans 8ffbb340ca
Merge pull request #5453 from devansh-webkul/image-issue
TinyMCE Image Issue Fixed #5450
2021-12-22 06:51:26 +01:00
Devansh 19e3a106b4 Extra Config Removed 2021-12-21 17:51:12 +05:30
Devansh 526dc5ace1 TinyMCE Image Issue Fixed 2021-12-21 17:48:55 +05:30
Devansh fcf2d11bd8 Zero Error Fixed 2021-12-21 15:50:23 +05:30
Sanjay 50c72a5930 v-pre added for customer note 2021-12-21 10:52:16 +05:30
Devansh b4c325d367 Added Public 2021-12-17 12:56:11 +05:30
Devansh 7cd753387b Invalid Quantity Fixed 2021-12-17 12:44:38 +05:30
Devansh 236a52a4d2 Invalid Quantity Refund Issue Fixed 2021-12-16 10:01:49 +05:30
Devansh 20455bd24f
Merge pull request #5427 from devansh-webkul/export-issue
Export issue is fixed
2021-12-15 12:50:53 +05:30
Devansh 1cb76b6dec Export Issue Fixed 2021-12-15 12:46:42 +05:30
Devansh 92f6396756 Default UI Component Added 2021-12-15 12:03:06 +05:30
Devansh fbdf4f6312 Prevent Default Added 2021-12-15 11:35:37 +05:30
Devansh 89d40b6037 Date Of Birth Issue Fixed 2021-12-15 10:48:49 +05:30
Vivek be1d10248c [Updated: customer_group event and Models mappings.] 2021-12-05 16:42:36 +05:30
Vivek a76969dff7 [Updated: api and customer auth updated and added API locale translations.] 2021-11-30 18:26:53 +05:30
David Galet 01b050a4b1 Fix downlod produts 2021-11-29 10:14:35 +01:00
Devansh cde969868d Pregmatch Removed 2021-11-24 15:57:21 +05:30
Devansh 255f757521
Merge pull request #5343 from AmooAti/rtl_admin_menu
fix admin menu does not appear in rtl langs
2021-11-23 19:07:34 +05:30
AmooAti 8f421783d7 remove direction from props and using css 2021-11-23 14:49:53 +03:30
AmooAti dc445c0bf2 fix margin when opening and closing side nav, arrows direction, and arrow location in rtl 2021-11-22 17:57:01 +03:30
codeinnovers 90173e43d0 adding translations for PR for issue 5075 2021-11-22 19:03:44 +05:30
codeinnovers 6fddca74e3 adding translations for PR for issue 5075 2021-11-22 19:01:08 +05:30
AmooAti 6091a87b54 position fixed cause navbar corrupt in rtl 2021-11-22 14:53:58 +03:30
codeinnovers 4e93046bb2 fixing issue 5075 2021-11-20 13:34:20 +05:30
AmooAti be81249df5 fix admin menue does not apear in rtl langs 2021-11-19 20:03:21 +03:30
Devansh 1cfc6cd66d Disabled System Attributes 2021-11-16 16:09:07 +05:30
Devansh d42b21a6e4 Translation Added 2021-11-15 20:23:32 +05:30
merdan deb7a5d46f attribute image display 2021-11-15 19:20:36 +05:00
Devansh 42db7aca2d Some Minor Fixes Done 2021-11-03 10:39:02 +05:30
Glenn Hermans c4a5a617d3
Merge pull request #5285 from caleeli/send_reminders_for_overdue_invoices
Send reminders for overdue invoices
2021-11-02 18:12:16 +01:00
David Callizaya 8e9ef97ae2 Add Invoice Reminder translation Labels 2021-10-30 12:34:49 -04:00
David Callizaya 64d84943bd Add Config interval between reminders 2021-10-30 11:23:36 -04:00
Devansh 606fec12b8 SKU Validation Added In Edit Page 2021-10-29 09:27:19 +05:30
David Callizaya 206f1336b1 Add reminder email template 2021-10-28 17:33:25 -04:00
David Callizaya 4a0145a825 Add admin invoice reminders limit 2021-10-28 17:03:27 -04:00
junaidjaved248 bd0aff6e23 SKU Key Removed (Test Failed Issue Fixed) 2021-10-28 20:21:23 +05:00
junaidjaved248 f02deaa02b SKU Key Removed 2021-10-28 20:08:20 +05:00