merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,761 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

6592 Commits

Author SHA1 Message Date
devansh bawari 1b9acd277a Recompiled 2021-05-25 18:58:14 +05:30
devansh bawari ae7cfbb67d Merge remote-tracking branch 'upstream/master' into tax-enhancement 2021-05-25 18:56:45 +05:30
devansh bawari 29aa73e281 Added Product Price Method To Configurable 2021-05-25 18:54:16 +05:30
Glenn Hermans aace152a37
Merge pull request #4894 from amirfrd/add-fa-locale-to-js-validation 
Add fa locale to js validation
 2021-05-25 14:28:33 +02:00
devansh bawari b015ea473c Fixed Grouped Product Bug 2021-05-25 17:39:55 +05:30
amir frd 02fcac4d24 add fr/nl/tr locale to velocity app.js 2021-05-25 16:36:27 +04:30
amir frd eae7c95c1d add fr/nl/tr locale to shop app.js 2021-05-25 16:31:14 +04:30
amir frd b8ba37c5ae add fr/nl/tr locale to admin app.js 2021-05-25 16:29:12 +04:30
devansh bawari 05e9831c93 Added Missing Evaluation 2021-05-24 14:43:42 +05:30
devansh bawari 720a6eea73 Removed Tax Evaluation In Grouped Price 2021-05-24 14:36:23 +05:30
devansh bawari cf9d21f030 Configrable Default Bug Fixed 2021-05-24 13:37:59 +05:30
devansh bawari 0e43ad62c9 Merge branch 'master' into tax-enhancement 2021-05-24 09:37:56 +05:30
amir frd a4fdbb9fb0 add fa locale to velocity app.js 2021-05-21 15:59:19 +04:30
amir frd e63c7ee002 add fa locale to shop app.js 2021-05-21 15:56:11 +04:30
amir frd a00cb1edef add fa locale to admin app.js 2021-05-21 15:51:31 +04:30
devansh bawari 40120cd950 Merge remote-tracking branch 'upstream/master' into cart-rule-issue 2021-05-21 15:19:19 +05:30
devansh bawari 15c772c2a3 Cart Validator Added 2021-05-21 15:18:53 +05:30
devansh bawari a468759920 Length Added 2021-05-20 14:38:34 +05:30
devansh bawari 61d0d6ebf8 Added Parent Check 2021-05-20 13:05:54 +05:30
devansh bawari e99b4fcb73 Configurable Case Added 2021-05-20 12:35:02 +05:30
devansh bawari 0af1cfba10 Merge remote-tracking branch 'upstream/master' into tax-enhancement 2021-05-20 11:42:59 +05:30
devansh bawari 3526319b79 Added Datagrid Plus 2021-05-19 17:20:28 +05:30
devansh bawari d602b64bd1 Merge branch 'master' into tax-enhancement 2021-05-19 09:51:59 +05:30
Glenn Hermans a20e0651cc
Merge pull request #4879 from boombertz/admin-ptBR 
Update Admin translations in pt_BR
 2021-05-19 00:19:01 +02:00
Bertz 9f7ac512f3 Update Admin translations in pt_BR 2021-05-18 15:01:46 -03:00
Glenn Hermans 2aadfcc98d
Merge pull request #4876 from devansh-webkul/default-address 
Implemented default address for customers #4875
 2021-05-18 19:45:04 +02:00
devansh bawari b5a9ae05c8 Exchange Rate Key Added 2021-05-18 17:58:24 +05:30
devansh bawari ec9214c2bb Implemented In Default Theme 2021-05-18 14:34:16 +05:30
devansh bawari 52a6fbabda Velocity Theme Implemented 2021-05-18 14:24:35 +05:30
devansh bawari 0e14f9fdc2 Translation Added 2021-05-18 14:16:28 +05:30
Jitendra Singh 20708f60c5
Merge pull request #4859 from KarimQaderi/fix-lang-fa 
fix lang fa
 2021-05-18 09:57:40 +05:30
devansh bawari 2257b484a7 Typo Fixed 2021-05-17 12:09:37 +05:30
devansh bawari 87a3a2fb6b Merge branch 'master' into tax-enhancement 2021-05-17 10:36:49 +05:30
Glenn Hermans 3c2a91191b
Merge pull request #4862 from KarimQaderi/add-title-to-data-grid-actions-2 
add title to data grid actions
 2021-05-11 06:09:46 +02:00
KarimQaderi cca41bce72 add title to data grid actions 2021-05-10 22:50:06 +04:30
KarimQaderi 724711f51b Fix action datagrid plus for persian or arabic 2021-05-10 13:26:22 +04:30
KarimQaderi a0e50eed50 fix lang fa 2021-05-10 11:07:53 +04:30
devansh bawari 3b951350b5 Merge branch 'master' into tax-enhancement 2021-05-07 17:00:03 +05:30
Glenn Hermans dc2cc7a3c7
Merge pull request #4852 from rahulcs0082/4847 
Issue #4847 fixed
 2021-05-06 19:11:35 +02:00
devansh bawari a7a2b688e1 Recompiled 2021-05-06 16:20:17 +05:30
devansh bawari 6483618d57 Merge branch 'master' into tax-enhancement 2021-05-06 16:19:09 +05:30
Glenn Hermans 569b40e834
Merge pull request #4849 from shubhwebkul/master 
resolved #4848
 2021-05-06 12:46:26 +02:00
devansh bawari 8935fbbf13 Comments Fixed 2021-05-06 16:01:52 +05:30
devansh bawari 225e0636ef Imports Added 2021-05-06 15:56:18 +05:30
devansh bawari e01b991281 Finishing And Refactoring Dog Done 2021-05-06 15:45:56 +05:30
devansh bawari daa829b0b8 Reverted Admin Language 2021-05-06 14:09:48 +05:30
devansh bawari 8d00142e14 Packed Everything In One Package 2021-05-06 14:07:30 +05:30
devansh bawari 24c3317f56 Taxes Configuration Adjusted 2021-05-06 12:38:33 +05:30
rahulcs0082 158a4b9d87 Issue #4847 fixed 2021-05-06 10:57:02 +05:30
devansh bawari 48ced3f866 Merge branch 'master' into tax-enhancement 2021-05-06 10:47:49 +05:30
Glenn Hermans 1108e8114b email update 2021-05-05 23:15:56 +02:00
Glenn Hermans 01dc23d705
Moved email settings from general to email 2021-05-05 19:30:53 +02:00
Glenn Hermans eaf9b367c1
Moved email settings in admin panel 
Moved email settings from General to Email
 2021-05-05 19:25:26 +02:00
Glenn Hermans fe1ee2dcad
Updated notifications translations 2021-05-05 18:31:17 +02:00
devansh bawari f4ed91fdbd Translation Added For Velocity Theme 2021-05-05 19:47:43 +05:30
devansh bawari 6941ef230a Translation Added For Default Theme 2021-05-05 19:47:27 +05:30
devansh bawari 328f748cfe Implemented In Default Theme Also 2021-05-05 19:33:30 +05:30
devansh bawari 3a04aa37ac View Portion Handled 2021-05-05 18:36:46 +05:30
devansh bawari abc9d727e8 Price HTML Handled For All Product Types 2021-05-05 18:36:26 +05:30
devansh bawari 6222190c14 Translation Added For Configuration 2021-05-05 18:35:53 +05:30
devansh bawari b6d648ae0c Configuration Added 2021-05-05 18:35:28 +05:30
Shubham Mehrotra 0a2163f66b resolved #4848 2021-05-05 18:00:22 +05:30
Shubham Mehrotra b439a58891 Merge branch 'master' of https://github.com/bagisto/bagisto 2021-05-05 17:42:05 +05:30
devansh bawari 18a3e811d7 Tax Inclusive Added For Velocity Theme 2021-05-05 16:53:53 +05:30
Glenn Hermans 8a53abb354
Make labels clickable 2021-05-05 06:01:59 +02:00
Shubham Mehrotra f25c4a7153 Merge branch 'master' of https://github.com/bagisto/bagisto 2021-05-04 13:05:59 +05:30
devansh bawari e69bbe8cbc Recompiled 2021-05-04 09:33:48 +05:30
Glenn Hermans 794c166082 Added invoice states 2021-05-04 05:22:33 +02:00
Glenn Hermans 3a307a8371 fix #3251 2021-05-04 05:00:36 +02:00
Glenn Hermans 446c4384fe
Merge pull request #4841 from rahulcs0082/4840 
Issue #4840 fixed
 2021-05-03 15:24:06 +02:00
rahulcs0082 00f8497d2f Issue #4840 fixed 2021-05-03 16:49:18 +05:30
rahulcs0082 ee98ba8525 fixes as per comment 2021-05-03 14:27:08 +05:30
rahulcs0082 aa88f1390d Issue #4557 done 2021-05-03 11:36:17 +05:30
Glenn Hermans 899d70483d
Added missing space 2021-05-03 03:22:24 +02:00
Glenn Hermans b2fda6bea9
fixed order 2021-05-03 03:12:41 +02:00
Glenn Hermans e6c23a9810
Added missing params 2021-05-03 02:07:34 +02:00
Glenn Hermans 06803fa866
Updated php doc 2021-05-03 02:05:40 +02:00
Glenn Hermans 0f4da65937
Define custom order state on shipments 2021-05-03 02:03:28 +02:00
Glenn Hermans dbf8b9f384
added space 2021-05-02 20:01:27 +02:00
Glenn Hermans 761263c0e7
Merge pull request #18 from bagisto-europe/update_order 
fixed spacing
 2021-05-02 19:52:17 +02:00
Glenn Hermans db505d5551
fixed spacing 2021-05-02 19:39:03 +02:00
Glenn Hermans 04aac03bbd
fixed #3453 2021-05-02 19:29:52 +02:00
Glenn Hermans 52206b582f
Added optional custom order status 2021-05-02 19:18:30 +02:00
devansh bawari 59e08d26d9 Recompiled 2021-04-30 09:37:51 +05:30
devansh bawari 2b80b67283 Merged With Master 2021-04-30 09:36:11 +05:30
Glenn Hermans 1027ffce68
Merge pull request #4824 from devansh-webkul/ui-date-component-enhancement 
Date And Datetime Component Enhanced #4816
 2021-04-29 18:57:24 +02:00
devansh bawari c2cbca7146 Some Class Added To Select Box 2021-04-29 19:53:05 +05:30
devansh bawari fef39563ef Merge branch 'master' into ui-date-component-enhancement 2021-04-28 10:16:14 +05:30
devansh bawari 946bd501ae Recompiled 2021-04-28 10:12:32 +05:30
devansh bawari 26993d2a16 Merged With Master 2021-04-28 10:10:52 +05:30
Glenn Hermans 825b88627d
Merge pull request #4829 from rahulcs0082/3251 
Issue #3251 done
 2021-04-27 16:49:25 +02:00
rahulcs0082 3e3af212f4 conflict resolve 2021-04-27 19:24:04 +05:30
rahulcs0082 8732e8d8e4 Issue #3251 done 2021-04-27 19:09:53 +05:30
devansh bawari 4efb1676e0 Mouse Out Handled 2021-04-27 19:04:37 +05:30
devansh bawari a573fa380c Recompiled 2021-04-27 17:57:44 +05:30
devansh bawari cdc9c14e71 Merged 2021-04-27 17:56:45 +05:30
devansh bawari aff3438459 Missing Translation Added 2021-04-27 15:28:02 +05:30
devansh bawari 0d364e3be9 Exception Translation Added 2021-04-27 15:26:18 +05:30
Shubham Mehrotra b54dedd462 Merge branch 'datagrid-improvement' of https://github.com/devansh-webkul/bagisto 2021-04-27 11:03:24 +05:30
devansh bawari c00871c92b Updated Accordion Component 2021-04-27 10:51:56 +05:30
devansh bawari 856483711a Merge branch 'master' into ui-date-component-enhancement 2021-04-27 09:41:17 +05:30
devansh bawari 31d35508ea Merge branch 'master' into datagrid-improvement 2021-04-27 09:39:44 +05:30
Glenn Hermans 50be09e468
Merge pull request #4825 from devansh-webkul/ui-invoice-issue 
Fixed UI bug at customer invoice page if multiple invoice exist for same order id #4823
 2021-04-26 20:34:29 +02:00
devansh bawari dc41da1090 Some More Clean Up. Not Need .gitkeep As The Folder Is Not Empty 2021-04-26 19:20:32 +05:30
devansh bawari 19b0d01e95 Dynamic Height Issue 2021-04-26 18:11:33 +05:30
devansh bawari 894a6fa379 Merge branch 'master' into datagrid-improvement 2021-04-26 16:10:08 +05:30
devansh bawari d60e49e9df Date And Datetime Component Enhanced 2021-04-26 15:59:29 +05:30
Poghos 5633e23588 Added comma to last element 2021-04-26 13:29:15 +04:00
Poghos e5f1b33f48 Improved ProductFlat listener to make fillable attribute codes overridable 2021-04-26 13:27:30 +04:00
Devansh ac5fd1a36b Completed Multi Datagrid Component 2021-04-25 08:20:07 +00:00
Devansh 12c94c21ed Implemented In A Single Trait 2021-04-25 13:10:22 +05:30
Poghos dfff22a592 Event service providers improvements 2021-04-25 04:56:00 +04:00
Devansh 0df2b75ca8 Some Finishing Done 2021-04-24 19:11:22 +00:00
Devansh d29a7ac596 Fixed Undefined Type Properties Issues 2021-04-24 18:41:21 +00:00
Devansh 4186dc4adc Vue Component Added 2021-04-24 15:59:23 +00:00
Devansh b6b0806287 Datagrid Is Now Fully Ajaxified 2021-04-24 10:47:24 +00:00
Devansh 23142f9018 Wrapper And Conditions Handled 2021-04-24 08:20:00 +00:00
Devansh fb00e3ad63 Merge remote-tracking branch 'upstream/master' into multiple-datagrids 2021-04-24 01:10:09 +05:30
Devansh 93c59b60f8 Routes, Mass Action And Closure Fixed 2021-04-23 19:39:07 +00:00
Jitendra Singh 6e13e94fa8
Merge pull request #4817 from bagisto-europe/master 
Added findBySlug without fail
 2021-04-23 15:58:54 +05:30
rahul shukla ebefd3057d Issue #4818 fixed 2021-04-23 12:49:55 +05:30
Glenn Hermans b433b9d082
fixed spacing 2021-04-23 01:06:01 +02:00
Glenn Hermans 3ad04379bb
Added findBySlug 2021-04-23 01:00:55 +02:00
rahul shukla cd87356355 Issue #4813 fixed 2021-04-22 16:52:19 +05:30
devansh bawari 9a8eaee68b Merge remote-tracking branch 'upstream/master' into multiple-datagrids 2021-04-21 19:40:57 +05:30
devansh bawari 10bee6fb18 Blade Codes Are Now Seperated From The Scripts Part 2021-04-21 19:28:04 +05:30
devansh bawari 035efd4e87 Fully Blade Dependency Removed Now Translation Pending 2021-04-21 17:25:39 +05:30
devansh bawari d902c46fdf Blade Depenency Removed From Default Header Also 2021-04-21 14:37:27 +05:30
devansh bawari d3bf967461 All Filter Tags Blade Dependency Removed 2021-04-21 13:45:58 +05:30
devansh bawari b420ee782f Case Added 2021-04-21 11:54:53 +05:30
devansh bawari cdd08d13fe Filter Tag Blade Removed And Handled With Vue JS 2021-04-21 00:40:58 +05:30
devansh bawari 198fa5fdb2 Cleaned Blade File From The Component 2021-04-20 18:49:18 +05:30
Shubham Mehrotra 9acc8175c0 Merge branch 'datagrid-improvement' of https://github.com/devansh-webkul/bagisto 2021-04-20 12:11:48 +05:30
devansh bawari 49d1ca9f4f Merge branch 'master' into datagrid-improvement 2021-04-20 11:07:48 +05:30
Shubham Mehrotra 1814948811 Merge branch 'master' of https://github.com/bagisto/bagisto 2021-04-20 10:31:57 +05:30
Glenn Hermans c334844c85
Merge pull request #4810 from bagisto-europe/nl 
Updated dutch translations
 2021-04-20 05:41:44 +02:00
Glenn Hermans 3072e2dbde
Updated dutch translations 2021-04-20 05:23:15 +02:00
Glenn Hermans 9cfc83cb9f
Merge pull request #4805 from bagisto-europe/4804 
fixed #4804
 2021-04-19 15:22:29 +02:00
ghermans f2f1e547b7 updated templates 2021-04-19 15:04:01 +02:00
devansh bawari d359d95c36 Icon Path Added 2021-04-19 13:43:36 +05:30
Glenn Hermans 335ca4846e
Removed duplicate state 2021-04-19 03:52:18 +02:00
Glenn Hermans d70d2d065d
Added city to order summary 2021-04-19 03:40:15 +02:00
Glenn Hermans c912dc848f
Updated customer template 2021-04-19 03:38:32 +02:00
Glenn Hermans bcb5aa960c
Updated admin template 2021-04-19 03:38:06 +02:00
Glenn Hermans 85f3fece81
Merge pull request #4802 from devansh-webkul/issue-4799 
Dynamic product image resizing implemented #4799
 2021-04-16 16:01:15 +02:00
devansh bawari bf0c724504 Translations Added 2021-04-16 19:14:52 +05:30
devansh bawari e7dcd2c757 Core Configs Added 2021-04-16 19:14:39 +05:30
devansh bawari 312d6a150d Fixed #4800 2021-04-16 13:59:32 +05:30
devansh bawari cf3285191e Zip Mandatory Removed On Disabled Zip Range 2021-04-16 12:15:35 +05:30
devansh bawari a0fced67a1 Arranged Method Name 2021-04-15 17:36:17 +05:30
devansh bawari 6f00123afe Some More Refactors 2021-04-15 17:29:48 +05:30
devansh bawari 1b7925984c Removed . As folder is not empty. 2021-04-15 14:59:09 +05:30
devansh bawari a28ca57692 One Comment Updated 2021-04-15 14:44:13 +05:30
devansh bawari 234d8b4f76 DataGrid Further Enhanced 2021-04-15 13:47:22 +05:30
devansh bawari 7eb2e5328e Completed Datagrid Improvement 2021-04-15 12:17:24 +05:30
devansh bawari 26aa35c6be Necesssary Details Refactored 2021-04-14 20:29:49 +05:30
devansh bawari 146fe40577 Merge remote-tracking branch 'upstream/master' into datagrid-improvement 2021-04-14 19:57:05 +05:30
devansh bawari 0443050288 Sort And Filter Collection Refactored 2021-04-14 19:56:29 +05:30
devansh bawari f54b4f65a5 Get Collections Method Refactored 2021-04-14 17:54:41 +05:30
devansh bawari eddb40a957 Query String Method Refactored 2021-04-14 17:02:39 +05:30
devansh bawari 0475a66e2d One Method Refactored 2021-04-14 15:01:13 +05:30
devansh bawari 19b6bac1e7 One File Removed And Some Method Sortings Done 2021-04-14 14:03:32 +05:30
devansh bawari 33388641b9 Z Index Down To 1 For Clickable 2021-04-14 12:56:48 +05:30
devansh bawari dc5d2382ab Z Index Removed 2021-04-14 12:53:53 +05:30
devansh bawari 3b6b1c53e7 Paypal Partner Attribution ID Added 2021-04-12 12:14:54 +05:30
rahul shukla ef3ee7494c Issue #2715 fixed 2021-04-09 14:35:14 +05:30
Glenn Hermans 34f6cfa6da
Merge pull request #4786 from devansh-webkul/attributes-rename-issue 
Some Changes Done For L x W x H/D on product description #3196
 2021-04-08 12:21:02 +02:00
Jitendra Singh 78f9390474
Merge pull request #4780 from rahulshukla-webkul/4754 
Done with - #4754
 2021-04-08 15:01:13 +05:30
devansh bawari 10355a8189 Numbering Arranged 2021-04-08 14:58:26 +05:30
devansh bawari b1ec093e75 Seeder Updated 2021-04-08 14:51:07 +05:30
Jitendra Singh c434c62ebd
Merge pull request #4781 from rahulshukla-webkul/4779 
Issue #4779 fixed
 2021-04-08 14:50:58 +05:30
rahul shukla f23b559a8e Fixes alignment issue 2021-04-08 14:44:06 +05:30
rahul shukla 1f37d1d3f9 Fixes as per comment 2021-04-08 13:48:16 +05:30
devansh bawari dc079df746 Date Time Component Enhanced 2021-04-08 11:13:38 +05:30
rahul shukla e43874c255 Issue #4779 fixed 2021-04-07 18:02:05 +05:30
rahul shukla 961ccea17d Merge branch 'master' of https://github.com/bagisto/bagisto into 4754 2021-04-07 17:00:48 +05:30
rahul shukla e1a0b4a817 Done with enhancement #4754 2021-04-07 17:00:25 +05:30
devansh bawari 4a407ae0ae Merge branch 'master' into php-8-support 2021-04-06 10:44:09 +05:30
Glenn Hermans 09b3c9d25f
Merge pull request #4759 from rahulshukla-webkul/4752 
fixed #4752
 2021-04-06 05:36:59 +02:00
rahul shukla cec4912041 Issue #4773 fixed 2021-04-05 14:06:04 +05:30
devansh bawari a81b37aeb9 Merge branch 'master' into php-8-support 2021-03-25 21:16:03 +05:30
devansh bawari 4cadfbc94d PHP 8 Support Added 2021-03-25 20:04:47 +05:30
Glenn Hermans a06943c695
Merge pull request #4765 from devansh-webkul/issue-4758 
Integer type added to quantity #4758
 2021-03-25 13:42:48 +01:00
Glenn Hermans b1fce951fc
Merge pull request #4764 from devansh-webkul/s-3 
SVG Sanitizer Enhanced - SA3
 2021-03-25 12:33:59 +01:00
devansh bawari bbd4ba1982 Some Code Fixes 2021-03-25 16:24:25 +05:30
devansh bawari e4ac40955d Type Added 2021-03-25 16:16:45 +05:30
devansh bawari 7bbf0c4bb5 SVG Sanitizer Enhanced 2021-03-25 14:10:47 +05:30
rahul shukla b848be65e9 Enhancement #4752 fixed 2021-03-24 17:06:14 +05:30
Glenn Hermans 3141e28b01
Merge pull request #4757 from devansh-webkul/issue-4755 
Fixed issue in which selecting all channels from admin product list throws error #4755
 2021-03-23 19:30:19 +01:00
Glenn Hermans 23080a4b59
Merge pull request #4756 from devansh-webkul/issue-4751 
Icon Positions Changed #4751
 2021-03-23 18:24:02 +01:00
Glenn Hermans 76da5bf91c
Merge pull request #4750 from rahulshukla-webkul/4748 
Issue #4748 fixed
 2021-03-23 13:28:33 +01:00
devansh bawari a6eef6824c Case Handled 2021-03-23 17:57:14 +05:30
devansh bawari 8b4f075002 Icon Positions Changed 2021-03-23 17:22:35 +05:30
Glenn Hermans 315976236e
Merge pull request #4743 from rahulshukla-webkul/development 
Issue #4735 fixed
 2021-03-22 15:25:22 +01:00
rahul shukla 5e087c850a Issue #4748 fixed 2021-03-22 16:17:51 +05:30
Jitendra Singh 6b2382518b
Merge pull request #4739 from devansh-webkul/issue-4729 
Fixed products which are not exist inside a category and still they are visible on the category page #4729
 2021-03-22 14:09:02 +05:30
rahul shukla a5bc6e7334 Enhancement done #3778 2021-03-19 20:18:33 +05:30
rahul shukla f36afb8d50 Enhancement done #3778 2021-03-19 20:07:58 +05:30
rahul shukla 776fba349f add another class for css 2021-03-19 16:57:45 +05:30
rahul shukla a6482d5274 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-19 15:33:22 +05:30
rahul shukla ba37438ab7 chnages as per comment 2021-03-19 15:22:24 +05:30
rahul shukla e96ea332d2 Merge branch 'master' of https://github.com/bagisto/bagisto into 3477 2021-03-19 14:23:01 +05:30
rahul shukla eade4b3910 Resize of image done 2021-03-19 14:22:53 +05:30
devansh bawari 6698ef2eb0 Merge branch 'master' into issue-4729 2021-03-18 19:22:10 +05:30
rahul shukla 0a8578e796 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-18 13:09:00 +05:30
Jitendra Singh 25fec09081
Merge pull request #4731 from devansh-webkul/issue-4730 
Product Deletion Code Removed #4730
 2021-03-17 19:38:19 +05:30
devansh bawari 207ec1d096 Merge branch 'master' into issue-4729 2021-03-17 16:38:36 +05:30
devansh bawari 1f7fa4ef66 Merge branch 'master' into issue-4730 2021-03-17 16:38:00 +05:30
rahul shukla f95a693473 Issue #4735 fixed 2021-03-16 13:28:05 +05:30
devansh bawari dd5effeb2b Shop Provider Update 2021-03-16 10:33:42 +05:30
Daniel Spiridonoff 2315f2da5a
Merge branch 'master' into spanish-language 2021-03-15 14:50:34 -03:00
Jitendra Singh a373e0cf33
Merge pull request #4713 from devansh-webkul/s-6 
Paypal IPN Issue Fixed - SA6
 2021-03-15 21:07:16 +05:30
devansh bawari b5b1b0453c Query Fixed 2021-03-15 20:06:58 +05:30
rahul shukla c47e3c8c3f Order transaction for paypal standard 2021-03-15 19:57:39 +05:30
devansh bawari 078d7e39dc Some Fixes Done 2021-03-15 18:28:09 +05:30
rahul shukla 5aa2ea7455 Translation added for all lang for transaction and align en lang 2021-03-15 15:05:31 +05:30
devansh bawari 000f5b4703 Merge branch 'master' into s-6 2021-03-15 11:52:06 +05:30
devansh bawari ce6af93d72 Merge branch 'master' into issue-4730 2021-03-15 11:37:25 +05:30
devansh bawari 3652d1a4bb Model Instance Given To Events 2021-03-15 11:36:42 +05:30
Daniel Spiridonoff 033d6b23f7 Update spanish translation for Admin module 2021-03-13 13:07:25 -03:00
Daniel Spiridonoff 5a89b10795 Spanish language seeder added for channels 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff a1f85814da Corrected format 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff b3aed5f6fe Update spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 6a13758273 Spanish translation for states 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff ac219bf80d Spanish language added 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 16560c8ea4 Spanish translation for countries 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 8c0f8728cc Upgrade spanish translation for Admin and Shop modules 2021-03-13 12:57:30 -03:00
Daniel Spiridonoff 599e629b22 Spanish translation for BookingProduct, Core, Customer, SocialLogin, Ui and Velocity modules 2021-03-13 12:57:30 -03:00
devansh bawari 7e8892c22d Merge branch 'master' into s-6 2021-03-12 19:26:04 +05:30
devansh bawari 47722198b3 Merge branch 'master' into issue-4730 2021-03-12 19:25:09 +05:30
rahul shukla 5997bbd940 Order Transaction added for paypal smart button 2021-03-12 19:11:06 +05:30
rahul shukla 14bf78a195 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2021-03-12 19:07:45 +05:30
rahul shukla 7282bcabfc Order Transaction added for paypal smart button 2021-03-12 19:07:08 +05:30
devansh bawari b9cf2a6544 Some Exception Handled On Dashboard Page 2021-03-12 18:48:55 +05:30
devansh bawari 57c2b20ac9 Merge remote-tracking branch 'upstream/master' into issue-4730 2021-03-12 18:29:17 +05:30
Glenn Hermans 0d10ddb8f9
Merge pull request #4721 from devansh-webkul/responsive-admin 
Enhancement Completed Responsive Admin #4295
 2021-03-12 13:49:50 +01:00
devansh bawari 76e3bbe4a2 Product Deletion Code Removed 2021-03-12 18:10:52 +05:30
Jitendra Singh 12e81a36f0
Merge pull request #4706 from devansh-webkul/issue-4698 
Fixed category slug which is not translation based #4698
 2021-03-12 16:42:39 +05:30
devansh bawari a0ad610a69 Merge remote-tracking branch 'upstream/master' into responsive-admin 2021-03-12 13:45:35 +05:30
devansh bawari 74633a6ee5 Merge branch 'master' into responsive-admin 2021-03-12 13:44:47 +05:30
devansh bawari 09b67455c3 Merge branch 'master' into issue-4698 2021-03-12 13:34:20 +05:30
devansh bawari e8189013e0 Merge branch 'master' into s-6 2021-03-12 13:33:13 +05:30
devansh bawari 45ddd14798 Merge branch 'master' into s-4 2021-03-12 13:31:35 +05:30
Jitendra Singh 40915dcbfb
Merge pull request #4728 from devansh-webkul/issue-4727 
Fixed error `addToCartHtml` which is not defined on the compare page #4727
 2021-03-12 12:54:16 +05:30
Jitendra Singh bc8bc6814f
Merge pull request #3924 from devansh-webkul/duplicate_order_issue 
Fixed duplicate order number getting generated when placed order simultaneously #3902
 2021-03-12 12:52:39 +05:30
devansh bawari 19e95b2eca Key Added 2021-03-12 12:28:25 +05:30
devansh bawari 87829b8380 Merge remote-tracking branch 'upstream/master' into issue-4698 2021-03-12 11:04:37 +05:30
devansh bawari bc935e2df3 Variables Updated 2021-03-12 10:54:02 +05:30
Glenn Hermans 8728d58720
Merge pull request #4725 from devansh-webkul/issue-4722 
Fixed getting exception on wishlist when add configurable item on cart #4722
 2021-03-11 16:19:40 +01:00
devansh bawari 18f4a6f58f Wishlist Check Fixed 2021-03-11 18:57:56 +05:30