Commit Graph

12716 Commits

Author SHA1 Message Date
sanjay bhatt 8d4bdce16d Conflcts resolved 2022-11-28 13:50:31 +05:30
Akhtar Khan 66c0c94302 changes done 2022-11-26 17:46:53 +05:30
Akhtar Khan cd95af4b9b changes done as per suggested 2022-11-26 17:43:31 +05:30
Akhtar Khan f181ca43dd Issue Fixed #7080 2022-11-26 16:07:39 +05:30
Devansh Bawari 1d9d19ac86 Fixed For Configurable And Grouped Product 2022-11-26 13:35:02 +05:30
Devansh Bawari 7436e5ff01 Some Changes Done 2022-11-26 12:57:02 +05:30
Devansh Bawari 5efcee4774 Fixed URL Issue 2022-11-26 12:54:01 +05:30
Abhishek Kathuria b2d93d888a resolved conflict 2022-11-26 10:51:08 +05:30
gh darvishani d23296ff33
Merge branch 'master' into features-login-as-customer 2022-11-25 20:35:30 +03:30
darvishani 5e957d434a fix Conflicts 2022-11-25 20:33:01 +03:30
darvishani eca912e1ae clean code 2022-11-25 20:00:44 +03:30
prabhat gautam 80e8c4359a imported vue-cal translations 2022-11-25 18:51:00 +05:30
sanjeev cc6a7be6c3 Added check for velocity add-to-cart 2022-11-25 18:48:23 +05:30
sanjeev 4b62305fe2 conditions updates 2022-11-25 18:19:11 +05:30
merdan c0c8197d63 cek brand shipment 2022-11-25 17:18:32 +05:00
merdan ac36e517e9 cek brand shipment 2022-11-25 17:15:17 +05:00
merdan f2d7cbf97b cek brand shipment 2022-11-25 17:08:54 +05:00
merdan dacab3bf63 cek brand shipment 2022-11-25 17:07:33 +05:00
merdan c2b9daf329 cek brand shipment 2022-11-25 17:05:39 +05:00
shagun2405 a7979d709a Issue #6972 fixed 2022-11-25 17:06:58 +05:30
merdan 035f379c26 cek brand shipment 2022-11-25 16:30:49 +05:00
darvishani ea7a01d8ad clean code 2022-11-25 14:59:10 +03:30
Jitendra Singh e4974d3823
Merge pull request #7129 from papnoisanjeev/product-view-by-url-without-enable-individually
Product view by URL (pasting slug) without enabling  product view individually  #6756
2022-11-25 16:27:27 +05:30
sanjeev 0f4ad23601 translation message removed 2022-11-25 16:12:37 +05:30
darvishani b81301c828 feature : add login as customer to admin customer grid 2022-11-25 13:11:11 +03:30
sanjeev d8292611ef updates 2022-11-25 13:43:56 +05:30
sanjeev daede4e43a updates 2022-11-25 10:53:34 +05:30
sanjeev fde0b0d432 removed flash message 2022-11-25 09:53:40 +05:30
Jitendra Singh aad4ba93fd
Merge pull request #7134 from papnoisanjeev/date-icon-shift-issue-with-error
Fixed Issue [#7133]
2022-11-24 19:01:32 +05:30
Jitendra Singh 5f70019f87
Merge pull request #7126 from papnoisanjeev/tooltip-booking-product-view
Tool tip added for booking product on table and calendar view icon #6987
2022-11-24 19:01:05 +05:30
Jitendra Singh 206045c895
Merge pull request #7131 from papnoisanjeev/event-ticket-booking-ui-issue-desciption
Ticket Booking UI Description Issue #7128
2022-11-24 19:00:33 +05:30
Jitendra Singh dc4fb890b5
Merge pull request #7127 from jitendra-webkul/master
Added selective indexing
2022-11-24 19:00:03 +05:30
sanjeev cc8dd8bf07 Added checks for different action if product individual view inactive. 2022-11-24 18:34:58 +05:30
sanjeev 3be901147d added error message and translation for the same. 2022-11-24 13:34:25 +05:30
sanjeev 0225c34f9c Complied files 2022-11-24 12:42:27 +05:30
sanjeev 29946dc9e5 Fixed Issue [#7133] 2022-11-24 12:38:50 +05:30
sanjeev 6879d236bc Ticket Booking UI Description Issue 2022-11-24 10:42:49 +05:30
merdan ed6fb21bd5 cek brand shipment 2022-11-23 17:29:39 +05:00
merdan 667e041de9 cek brand shipment 2022-11-23 17:26:41 +05:00
merdan fa6a946df2 cek brand shipment 2022-11-23 17:20:48 +05:00
sanjeev 90e7d258be Product view by url without enabling product view individually #6756 2022-11-23 15:52:23 +05:30
jitendra ce0178744b Added selective indexing 2022-11-23 13:15:15 +05:30
sanjeev c12e7fe09a Tooltip added for booking product for table and calender view icon #6987 2022-11-23 12:28:10 +05:30
sanjay bhatt 5c39451967 Conflicts resolved 2022-11-23 11:27:18 +05:30
Jitendra Singh cbe0d51a33
Merge pull request #6973 from vivek-webkul/patch-65
[Updated: performed changes for email templates.]
2022-11-22 16:27:41 +05:30
Vivek Sharma 61930a5ff5 [changes done.] 2022-11-22 16:10:29 +05:30
Vivek Sharma 6b15704b3c [saved.] 2022-11-22 15:55:52 +05:30
Vivek Sharma 93adb392d5 resolve conflict 2022-11-22 15:31:32 +05:30
Jitendra Singh cedd7cb140
Merge pull request #7124 from Sanjaybhattwebkul/chenage-bengali-locale-code
Issue #7085 Fixed
2022-11-22 15:21:35 +05:30
sanjay bhatt 5805f9ec2d Issue #7085 Fixed 2022-11-22 15:09:04 +05:30