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

1621 Commits

Author SHA1 Message Date
Glenn Hermans 5bcdcd60f2
Merge branch 'master' into master 2020-07-29 16:24:33 +02:00
Devansh 32140a0e23 Some Enhancement 2020-07-29 19:06:43 +05:30
Glenn Hermans 52163fb78f Moved payment & shipping method 2020-07-29 14:31:59 +02:00
Glenn Hermans 3863ae7b72 fixed requested changes 2020-07-29 14:02:06 +02:00
Glenn Hermans 701d94e62e ready for testing 2020-07-28 16:48:27 +02:00
Glenn Hermans fa120062df Updated translations 2020-07-28 16:45:36 +02:00
Jitendra Singh 74bcf073c1
Merge pull request #3511 from vishal-webkul/issue-3495 
Issue #3488 fixed
 2020-07-28 18:16:03 +05:30
Annika Wolff cea94c7296
Merge branch 'master' into admin-backend/keep-search-terms-after-new-page-load 2020-07-28 13:21:31 +02:00
Glenn Hermans 7ed5cd4133 Updated Invoices datagrid 2020-07-27 17:08:21 +02:00
Glenn Hermans 80f3befe7c Added translations for invoices 2020-07-27 17:07:50 +02:00
Glenn Hermans c023ee95d7 Init changes for invoices 2020-07-27 17:07:19 +02:00
Annika Wolff 194e8e1395 Merge 'bagisto-master' 2020-07-24 15:06:35 +02:00
Annika Wolff 40aa4848ed Merge remote changes 2020-07-24 15:05:24 +02:00
Annika Wolff 8dec3cdd14 show filtered channels, locales and customer groups by name 2020-07-24 15:04:20 +02:00
rahulshukla-home ecba982184 Issue #3561 fixed 2020-07-24 12:18:26 +05:30
vishal-webkul 1ae5ad201f
Merge branch 'master' into issue-3495 2020-07-22 09:39:00 +05:30
Jitendra Singh 25a3d93c31
Merge pull request #3529 from devansh-webkul/admin-email-in-default-locale 
Admin should get mail according to admin's default locale issue fixed #3520
 2020-07-21 19:52:25 +05:30
Jitendra Singh c8dd07c8c8
Merge pull request #3537 from jitendra-webkul/1.0 
Issue #3451 fixed
 2020-07-20 23:04:05 +05:30
jitendra ba8151c223 Issue #3451 fixed 2020-07-20 23:03:16 +05:30
Devansh 9f7b3dd5ee Admin Email In Their Default Locale 2020-07-20 16:34:09 +05:30
rahulshukla-home 17a2309217 Issue #3490 fixed 2020-07-20 11:11:30 +05:30
rahulshukla-home ecf9b3cd84 Issue #3502 2020-07-17 14:45:37 +05:30
vishal-webkul 66a7b40bbc color attribute default swatch value should be selected as dropdown swatch - issue fixed #3488 2020-07-17 13:29:47 +05:30
vishal-webkul 0f998d9e57 Back icon is not working in catalog and cart rule grid - Bug Fixed 2020-07-16 12:20:01 +05:30
rahulshukla-home 012b2c2b6b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-07-14 18:04:16 +05:30
rahulshukla-home 6b648bf69c dependent field issue 2020-07-14 18:01:52 +05:30
olaysco e09bf9efb1 include config seeders to enable social login by default 2020-07-10 17:22:11 +01:00
rahulshukla-home 2b9651fd77 Issue #3310 fixed 2020-07-07 15:39:58 +05:30
Jitendra Singh ce0ec932cd
Merge pull request #3435 from jitendra-webkul/1.0 
Fixed issue in order view page if customer group is null
 2020-07-07 12:38:59 +05:30
jitendra fdb214ec22 Fixed issue in order view page if customer group is null 2020-07-07 12:20:51 +05:30
rahulshukla-home 4c76fb27e9 Issue #3409 fixed 2020-07-06 16:54:16 +05:30
ghermans 105d6fd566 fixed #3381 2020-07-02 22:13:35 +02:00
rahulshukla-home 1cd7f76a3d Issue #3392 fixed 2020-07-02 14:57:31 +05:30
Pranshu Tomar 35b200a7cf Issue #3331 fixed 2020-06-24 17:31:28 +05:30
Pranshu Tomar ad6bab6a3a Remove button will be enabled by default in date component 2020-06-19 14:49:58 +05:30
Pranshu Tomar 9a4adc50ab Issue #3289 fixed 2020-06-19 14:01:22 +05:30
Pranshu Tomar 8478a4a710 Issue #3222 fixed 2020-06-19 13:43:32 +05:30
Pranshu Tomar a7a4fd12e5 Issue #3246 fixed 2020-06-19 13:06:16 +05:30
Pranshu Tomar 87b3f2acdc Conflicts resolved 2020-06-18 15:58:18 +05:30
Pranshu Tomar 6840198571 Issue #3273 fixed 2020-06-18 15:55:05 +05:30
ahmedusama250 33947fc72c
Merge pull request #1 from bagisto/master 
Catalog Rules missing in the permissions list
 2020-06-17 14:00:09 +02:00
Shubham Mehrotra 976cd9f940 Merge branch 'master' of https://github.com/bagisto/bagisto into patch-2 2020-06-17 10:24:44 +05:30
Shubham Mehrotra bf8828326d resolved design issues 2020-06-17 10:21:55 +05:30
AhmedUsama 74d4c15cdf fix in route in permissions of catalog roles 2020-06-17 00:07:46 +02:00
AhmedUsama a5dd53299c Add catalog rules in permissions list in select tree of role 2020-06-16 23:58:42 +02:00
Pranshu Tomar 2ed98a2838 Issue #3237 fixed 2020-06-16 19:49:01 +05:30
Pranshu Tomar 65fddfc20d Issue #3246 fixed 2020-06-16 19:27:53 +05:30
Jitendra Singh 9f27e46d5c
Merge pull request #3239 from ghermans/development 
Customer details
 2020-06-16 13:03:50 +05:30
Shubham Mehrotra c23d58bc38 resolved rtl design issues 2020-06-15 17:26:22 +05:30
shubhammehrotra.symfony@webkul.com 90eed2792b previous changes 2020-06-15 13:45:59 +05:30
ghermans 7b47e1f173 Added customer overview 2020-06-15 04:29:00 +02:00
Jitendra Singh 497412abfd
Merge pull request #3201 from shivam-webkul/master 
#3197 solved
 2020-06-11 12:04:31 +05:30
shivam kumar 94fb0c3d24 #3068 resolved & code updated 2020-06-11 11:36:32 +05:30
shivam kumar 65cef43a0b #3068 resolved 2020-06-10 20:07:50 +05:30
Shubham Mehrotra faa3f6e572 #3207 2020-06-10 15:45:33 +05:30
Shubham Mehrotra 2c9d8de97f remove changes 2020-06-10 15:26:32 +05:30
Shubham Mehrotra 06d025ffed #3203 2020-06-10 15:10:47 +05:30
Herbert Maschke 5c2db445b8
Remove redundant filter in cart rule index page 2020-06-08 13:00:53 +02:00
Jitendra Singh ee708f9df4
Merge pull request #3180 from jitendra-webkul/1.0 
Issue #3070 fixed
 2020-06-05 18:43:37 +05:30
Pranshu Tomar 31b9ae7e3e Issue #3070 fixed 2020-06-05 18:41:38 +05:30
phillipcodes 8867eccd90
fix typo 2020-06-05 11:59:52 +02:00
Florian Bosdorff 9219c283fb Merge branch 'bagisto/master' into haendlerbund/copy-cart-rules 2020-06-04 13:05:55 +02:00
Jitendra Singh 303b8765c2
Merge pull request #3173 from ilyasokay/language-development 
Added Turkish Translation
 2020-06-04 12:22:58 +05:30
Jitendra Singh d75059254b
Merge pull request #3134 from Haendlerbund/cart-rule-validator-extension 
Cart rule validator extension
 2020-06-03 19:39:04 +05:30
İlyas Okay 77e0610c89 Turkish Language added and English language duplicate rows deleted. 2020-06-03 16:22:23 +03:00
phillipmohr 9fbd436892 add table, lists, link and hr functionality to editor 2020-06-03 09:44:19 +02:00
Herbert Maschke 6ee005dda0 make a prefix to the copied cart rule ('copy of XXX') and properly save related channels and customer groups after replication 2020-06-03 09:24:40 +02:00
Annika Wolff 4104a7b2ba Merge bagisto/master into cart-rule-validator-extension 2020-06-03 07:36:43 +02:00
Annika Wolff ca6933d3a8 add english translation to foreign languages 2020-06-03 07:15:56 +02:00
Jitendra Singh 0b4b09b670
Merge pull request #3162 from bagisto/1.0 
Added customer group price
 2020-06-02 18:14:42 +05:30
Pranshu Tomar ae9ec7ce9b Added customer group price 2020-06-02 18:13:34 +05:30
Annika Wolff 2748ba84ce add additional to all languages 2020-05-28 13:39:41 +02:00
Annika Wolff 566c65ef99 Merge 'master' into cart-rule-validator-extension 2020-05-28 13:36:13 +02:00
Annika Wolff 5f10981136 Merge 'master' of https://github.com/Haendlerbund/bagisto 2020-05-28 13:25:47 +02:00
Annika Wolff f53a6fba16 extend cart rule validation with search in cart item additional 2020-05-28 13:14:58 +02:00
Jitendra Singh 23fd60cf2b
Merge pull request #3121 from Haendlerbund/copy-cart-rules 
introduce the ability to copy a cart rule
 2020-05-27 16:22:54 +05:30
Jitendra Singh 8e3be0c692 Merge pull request #3109 from Haendlerbund/add-field-company-name-to-views 
add field company_name to views
 2020-05-27 15:04:18 +05:30
Herbert Maschke b4a18bfaf3 introduce the ability to copy a cart rule 2020-05-26 13:39:54 +02:00
Herbert Maschke 11fb120b51 adjust cart rule filter position a few pixels to align it as it is in products/index.blade.php 2020-05-25 08:31:12 +02:00
Steffen Mahler f04abcbc85 add field company_name to views 2020-05-22 08:31:11 +02:00
Steffen Mahler d0d6f2b046 add field company_name to bliss views 2020-05-20 17:44:03 +02:00
Jitendra Singh 4ef9e3b683
Merge pull request #3094 from rahulcs0082/development 
Issue #3073
 2020-05-19 19:20:11 +05:30
rahulshukla-home f3dd1e4d99 Issue #3073 2020-05-19 18:46:43 +05:30
Jitendra Singh 84aede5cef
Merge pull request #3088 from jitendra-webkul/1.0 
Rich snippet feature added for products and category
 2020-05-18 23:08:33 +05:30
Pranshu Tomar 94e4a165eb Added translations to other languages 2020-05-18 23:07:12 +05:30
Pranshu Tomar 072b56930b Rich snippet feature added for products and category 2020-05-18 23:04:09 +05:30
Jitendra Singh 2ea98d4089
Merge pull request #3064 from kmso-de/feature/german-translation 
Feature/german translation
 2020-05-15 17:02:08 +05:30
Jan Bickel eb5de5acdf added localize to admin 2020-05-15 07:56:41 +02:00
Jan Bickel 755874e0ae removed Validator.localize('de', de) & Vue.use(VeeValidate) 2020-05-15 07:51:53 +02:00
Jitendra Singh c26a759fbc Added polish language 2020-05-13 20:22:25 +05:30
Roman Berneburg 05c3012eda german translations for Customer, Admin, Shop 2020-05-13 16:49:49 +02:00
Jan Bickel b1c3f7f3d0 german translations shop and admin 2020-05-13 16:49:40 +02:00
Jan Bickel 64e5f19861 german translations 2020-05-13 16:49:17 +02:00
Jan Bickel eae82352f7 german translations 
# Conflicts:
#	packages/Webkul/Velocity/src/Resources/assets/js/app.js
 2020-05-13 16:49:14 +02:00
Roman Berneburg a1f4a29b28 translation 2020-05-13 16:46:50 +02:00
Roman Berneburg 74dfa77cd0 translation 2020-05-13 16:45:45 +02:00
Jan Bickel 35948d7acb admin german translation 2020-05-13 16:45:18 +02:00
Jan Bickel a8f8ecc23f added: files for translation 2020-05-13 16:44:53 +02:00
Jitendra Singh f3a49b35de
Merge pull request #3033 from Haendlerbund/flexible-exception-handling 
Improve exception handler
 2020-05-13 12:53:44 +05:30
Jitendra Singh 4af22ad5df
Merge pull request #3034 from Haendlerbund/fix-namespace-issues 
fix namespace issues
 2020-05-13 12:53:21 +05:30
ottopodo 909913870b Italian translation 
Correct bug
 2020-05-11 22:46:35 +02:00
ottopodo 9229e36175 Italian Translations 2020-05-11 19:19:28 +02:00
rahulshukla-home 9fb5d2f75e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-05-11 09:52:02 +05:30
rahulshukla-home 3af919ee5f Issue #3024 2020-05-11 09:51:37 +05:30
Florian Bosdorff 33ddae27ae fix namespace issues 2020-05-09 12:38:20 +02:00
Florian Bosdorff 85ef3fe69b remove unused exception handler; make exception handler extendable 2020-05-09 12:21:54 +02:00
Pranshu Tomar 527affe741 Resolved conflicts 2020-05-08 21:50:06 +05:30
Pranshu Tomar cdf637f833 Added configuration for category page toolbar 2020-05-08 21:47:47 +05:30
Jitendra Singh c0fb97bf80
Merge pull request #3019 from jitendra-webkul/1.0 
Version details added in menu
 2020-05-07 20:17:23 +05:30
Pranshu Tomar b0a811462f Version details added in menu 2020-05-07 20:12:06 +05:30
Annika Wolff 41754f4f73
Bagisto to HB Update (#23) 
* Bump symfony/http-foundation from 4.4.5 to 4.4.7

Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.5 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.5...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>

* remove line

* #2808

* #2785

* checkout page margin added

* {git commit -m

* checkout page issue

* modal view update

* bundled assets

* remove irrelevant css

* #2775

* remove irrelevant xhr

* revert back changes in format price

* category call get products method

* customer options click issue resolved

* customer panel accordian view and file picker view

* customer accordian design update

* Issue #2812

* compare page update height after loading images

* api changes

* code changed for api

* #2329

* issue #2792 resolved

* margin added between wishlist icon and compare icon

* checkout page email validation

* #2834

* Issue #2713 fixed

* Issue #2851 fixed

* Issue #2847

* Issue #2851 fixed

* Issue #2768 fixed

* #2691

* Issue #2794

* #2849

* #2856

* Changelog updated

* subcategory visibility issue in responsive

* #2790

* Issue #2793

* Issue #2846 fixed

* Changelog updated

* Fixed date icon issue

* Translate mass-update for review status in admin grid

* Fix save-category btn translation for langs with noun case

* Added more view_render_events in the customer account views

* Added view_render_event to admin order view

* Created new view_render_events for admin order and invoice view

* #2866

* calculate height on change value of dropdown

* #2876

* Issue #2784 fixed

* Updated changelog

* Issue #2871 fixed

* Issue #2543 fixed

* subcategory issue resolved

* Updated changelog

* #2875

* Issue #2890

* 2875 update

* remove channel from tax category

* introduce channel and channel inventory source factories

* Issue #2895

* removed dd

* Issue #2893

* add unified address-table and handling for models

* Issue #2884

* Issue #2863 fixed

* fix address_type at many places; add tests for address relations

* Issue #2793

* Issue #2721

* fix address-constrains; fix address global scopes

* variant products images update issue resolved

* rename address types

* responsive cart count update

* #2915

* fix typo in address migration

* update

* update

* add option to OrderItemFactory to use existing product

* Added new events to customer update and checkou, fixed some view render events and pt_BR grammar

* Add Japanese translation

* Moved command to packages

* Updated composer lock file

* Bump symfony/http-foundation from 4.4.5 to 4.4.7

Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.5 to 4.4.7.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.4.5...v4.4.7)

Signed-off-by: dependabot[bot] <support@github.com>

* #2908

* customer sidebar menu issue resolved

* removed layered navigation in searchproducts page

* #2919

* content header path update

* add check if view exists

* [Updated: getBaseImage() method updated for configurable product.]

* Cancel feature added in customer order

* Installer fixes

* resolved issue with product images carousel

* change file name from views to Views

* Auto exchange rate feature added

* fix category issue and change country,state order

* max price issue in category

* Updated change log file

* Updated change log file

* fix translation in add attribute button

fix add button not translated to other language.

* Issue #2954 fixed

* Removed unnecessary code from CartController

* Issue #2954 fixed

* Issue #2945 fixed

* Updated change log file

* Updated change log file

* Version updated in env files

* add CartRuleCest

* introduce channel and customer group filter for cart rule grid

* fix calulation helper in test

* Issue #2949 and #2950

* resolve issue 2964

* localization error message added in velocity theme

* type hint changed

* refactoring, variable renamed

* Issue #2942

* Issue #2942

* configuration added for favicon in admin

* Issue #2969

* #2974

* favicon for admin login

* fix randomly failing tax cest

* remove unnecessary use statements

* fix GuestCheckoutCest

* remove newline

* set price faker in Laravel5Helper to 2 decimals, fix rounding in CartTaxesCest too

* Added missing space for configurable/grouped product price.

* responsive product gallery issue resolved

* Issue #2987

* Issue #2987

* Product multiple image select feature added

* Order comment feature added

* process checkout if user not logged in

* Order comment email sent to customer

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Shubham Mehrotra <shubh0896m@gmail.com>
Co-authored-by: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com>
Co-authored-by: rahulshukla-home <rahulcs0082@gmail.com>
Co-authored-by: Herbert Maschke <thyseus@gmail.com>
Co-authored-by: shivam kumar <shivam.kumar174@webkul.com>
Co-authored-by: Shivam kumar <50355852+shivam-webkul@users.noreply.github.com>
Co-authored-by: hexu <hexu.garfield@gmail.com>
Co-authored-by: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Co-authored-by: VaD1ke <vl.slesarenko@gmail.com>
Co-authored-by: Carlos Augusto Gartner <contato@carlosgartner.com.br>
Co-authored-by: Florian Bosdorff <florian.bosdorff@haendlerbund.de>
Co-authored-by: José María Campaña <chemisax@gmail.com>
Co-authored-by: Vivek <viveksh047@webkul.com>
Co-authored-by: namvarii <50305913+namvarii@users.noreply.github.com>
Co-authored-by: Steffen Mahler <steffen.mahler@haendlerbund.de>
Co-authored-by: Herbert Maschke <thyseus@pm.me>
Co-authored-by: SteffenMahler <57138594+SteffenMahler@users.noreply.github.com>
Co-authored-by: Matt April <matthew.japril@gmail.com>
 2020-05-07 14:05:48 +02:00
Jitendra Singh ad306f7c3f
Merge pull request #3017 from jitendra-webkul/1.0 
Order comment email sent to customer
 2020-05-07 14:24:57 +05:30
Pranshu Tomar 0893513b60 Order comment email sent to customer 2020-05-07 13:58:14 +05:30
Jitendra Singh 45e61682cd
Merge pull request #3013 from jitendra-webkul/1.0 
Order comment feature added
 2020-05-06 22:52:09 +05:30
Pranshu Tomar 2a9c3de89a Order comment feature added 2020-05-06 22:48:48 +05:30
Jitendra Singh adaeaf7087
Merge pull request #3010 from jitendra-webkul/1.0 
Product multiple image select feature added
 2020-05-06 17:08:29 +05:30
Pranshu Tomar 95caad1e7a Product multiple image select feature added 2020-05-06 17:02:44 +05:30
Jitendra Singh 7639dfbf51
Merge pull request #2962 from Haendlerbund/channel-filter-for-cart-rule-grid 
introduce channel and customer group filter for cart rule grid
 2020-05-01 18:09:48 +05:30
rahulshukla-home 584b2ae9bd favicon for admin login 2020-04-30 18:31:41 +05:30
rahulshukla-home 2753c7b1d5 configuration added for favicon in admin 2020-04-29 16:35:04 +05:30
Herbert Maschke 3154d27f52 introduce channel and customer group filter for cart rule grid 2020-04-29 09:19:47 +02:00
namvarii cd8e994efa
fix translation in add attribute button 
fix add button not translated to other language.
 2020-04-28 18:09:21 +04:30
Jitendra Singh 22b4079fdb
Merge pull request #2952 from jitendra-webkul/1.0 
Auto exchange rate feature added
 2020-04-27 20:08:26 +05:30
Pranshu Tomar b3b20a904c Auto exchange rate feature added 2020-04-27 19:57:13 +05:30
Jitendra Singh 30061b8f8d
Merge pull request #2924 from cagartner/added_new_events_to_core 
Added new events to customer update and checkou, fixed some view rend…
 2020-04-27 11:31:09 +05:30
Jitendra Singh da9382d090
Merge pull request #2903 from Haendlerbund/unnecessary-channel-for-taxes 
Bugfix: Channel assigned to tax category
 2020-04-24 18:03:48 +05:30
Jitendra Singh 7629d85d16
Merge pull request #2910 from Haendlerbund/unified-addresses 
Unified addresses (#2902)
 2020-04-22 17:05:57 +05:30
Carlos Augusto Gartner 716345e378 Added new events to customer update and checkou, fixed some view render events and pt_BR grammar 2020-04-21 18:18:34 -03:00
Florian Bosdorff 01d4cb026f fix address_type at many places; add tests for address relations 2020-04-17 11:09:59 +02:00
rahulshukla-home 3412da366f Issue #2893 2020-04-16 19:18:01 +05:30
rahulshukla-home bcb32f3121 removed dd 2020-04-16 18:19:56 +05:30
rahulshukla-home 2eb8aa972c Issue #2895 2020-04-16 18:16:40 +05:30
Annika Wolff 7a9f099b7b remove channel from tax category 2020-04-16 10:25:45 +02:00
rahulshukla-home 1d502be939 Issue #2890 2020-04-15 15:11:08 +05:30
rahulshukla-home b65601ecd0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-04-13 23:04:02 +05:30
rahulshukla-home b88e239ad2 Issue #2543 fixed 2020-04-13 23:03:45 +05:30
Jitendra Singh fdd991a27b
Merge pull request #2879 from jitendra-webkul/1.0 
Issue #2871 fixed
 2020-04-13 21:06:30 +05:30
Pranshu Tomar dd46e23628 Issue #2871 fixed 2020-04-13 20:58:34 +05:30
Jitendra Singh 94a08b7c86
Merge pull request #2867 from VaD1ke/translation-fixes 
Translation fixes
 2020-04-13 16:01:44 +05:30
Carlos Augusto Gartner 1f30769a98 Created new view_render_events for admin order and invoice view 2020-04-12 22:08:51 -03:00
Carlos Augusto Gartner 5a3e1919d7 Added view_render_event to admin order view 2020-04-12 21:55:07 -03:00
VaD1ke e1ae7216d5 Fix save-category btn translation for langs with noun case 2020-04-11 13:09:20 +03:00
VaD1ke fe84dbb2fc Translate mass-update for review status in admin grid 2020-04-11 13:03:31 +03:00
Jitendra Singh 9375ed6a8e
Merge pull request #2852 from rahulcs0082/development 
Issue #2713 fixed
 2020-04-09 15:34:27 +05:30
Pranshu Tomar 66ea50bb5c Issue #2851 fixed 2020-04-09 15:16:24 +05:30
Pranshu Tomar 7d360626e0 Issue #2851 fixed 2020-04-09 14:24:25 +05:30
rahulshukla-home b58cc7e3e5 Issue #2713 fixed 2020-04-09 13:55:40 +05:30
shivam kumar 61f27800fd issue #2792 resolved 2020-04-07 19:51:42 +05:30
Shubham Mehrotra 0005241794 misc. updates 2020-03-30 21:09:40 +05:30
Carlos Augusto Gartner 3ab051c07a Added translation to velocity and fixed some admin translations 2020-03-25 12:59:15 -03:00
rahulshukla-home 4510a42d34 testing 2020-03-24 02:17:17 +05:30
Jitendra Singh 1ff5aaab92 Issue #2706 fixed 2020-03-23 14:48:03 +05:30
mohd asif a1124fc7b6 resolved conflicts 2020-03-19 18:07:25 +05:30
Jitendra Singh deda73af48 Issue #2594 fixed 2020-03-19 17:07:46 +05:30
Jitendra Singh 5902f0050c
Merge pull request #2681 from vivek-webkul/patch-41 
[Updated: Shop & admin email setting added in configuration.]
 2020-03-19 15:36:27 +05:30
Jitendra Singh 7faf5bb97f
Merge pull request #2690 from rahulshukla-webkul/development 
Issue #2549
 2020-03-18 18:52:02 +05:30
rahul shukla 7174ccbfd0 Issue #2549 2020-03-18 18:48:02 +05:30
Jitendra Singh 893564977f Issue #2518 fixed 2020-03-18 17:15:44 +05:30
Vivek ad76426fb5 [Updated: Shop & admin email setting added in configuration.] 2020-03-17 16:10:47 +05:30
mohd asif d2caa2af98 resolved commit 2020-03-17 09:36:45 +05:30
mohd asif e7a9303b51 updated missing translation for portoguese in admin package 2020-03-16 16:24:04 +05:30
mohd asif 65814e0f04 upadated missing translation for Dutch for admin package 2020-03-16 14:07:08 +05:30
mohd asif 9901209a4b upadated missing translation for persian in admin package 2020-03-16 13:25:14 +05:30
mohd asif 1e5baab3a4 added missed translation for arabic 2020-03-16 10:56:10 +05:30
mohd asif ae1215834b upadated remaining translation for ar 2020-03-13 18:43:14 +05:30
Jitendra Singh 195344e8a2
Merge pull request #2653 from jitendra-webkul/1.0 
Issue #2638 fixed
 2020-03-13 18:31:15 +05:30
Jitendra Singh 9b60f0b8ec Issue #2638 fixed 2020-03-13 17:51:46 +05:30
mohd asif dd4875004a updated translation for arabic and persia for admin package 2020-03-13 12:29:51 +05:30
mohd asif f01ab851fb fixed some more language translation issue in arabic and persia 2020-03-12 19:30:39 +05:30
mohd asif 9e6ed6f09d fixed translation in all packages 2020-03-12 13:32:56 +05:30
Annika Wolff 65b5ec9232 bugfix: show multiple flash messages in admin panel 2020-03-11 10:45:18 +01:00
Jitendra Singh 101df848d6 Remove static text from grid 2020-03-06 20:03:32 +05:30
Jitendra Singh 8ca9bd864c Remove static text from grid 2020-03-06 19:49:47 +05:30
Jitendra Singh 010ae65691 Resolved conflicts 2020-03-06 16:02:52 +05:30
Jitendra Singh 276a2e288b
Merge pull request #2612 from Haendlerbund/revert-2603-development 
Revert "Development"
 2020-03-06 15:16:08 +05:30
Jitendra Singh 955da20b45 Improved comments in code 2020-03-05 19:49:14 +05:30
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh d0fa3b2705 Replace DB alias with complete class name 2020-03-05 19:11:53 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
rahul shukla caccfcf840 Issue #2605 2020-03-05 16:28:19 +05:30
rahul shukla 72d7ca8851 Issue #2616 2020-03-05 16:04:12 +05:30
Jitendra Singh a6ce67151f Improved comments in code 2020-03-05 11:04:57 +05:30
Annika Wolff 152cde9e5c
Revert "Development" 2020-03-04 11:27:34 +01:00
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
rahul shukla e8ad719112 product datagrid locale and channel query improvement 2020-03-03 18:48:23 +05:30
rahul shukla 641b80d28a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2020-03-03 18:34:00 +05:30
rahul shukla 77b86ee786 query chnages for product datagrid 2020-03-03 18:33:38 +05:30
Jitendra Singh 45ec4532fa Resolved conflicts 2020-03-03 15:59:47 +05:30
Jitendra Singh 4a6ac73bb6 Improved code style 2020-02-28 15:55:53 +05:30
Jitendra Singh 131e3f1e18 Quantity box checks added for booking product 2020-02-28 13:00:29 +05:30
shubhammehrotra.symfony@webkul.com ce56c13fd0 Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated 2020-02-27 20:21:37 +05:30
Jitendra Singh 0dd0897e68
Merge pull request #2542 from ghermans/shipments 
Improved order shipments info
 2020-02-27 18:38:53 +05:30
shubhammehrotra.symfony@webkul.com 87f801dbce changes from master 2020-02-27 16:16:29 +05:30
shubhammehrotra.symfony@webkul.com 13312e8234 compare product's dynamic attributes 2020-02-27 16:14:00 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
rahul shukla b0b4935006 time added in cart rules 2020-02-26 16:58:53 +05:30
Jitendra Singh 7d2ff93f43 Resolve conflicts 2020-02-25 11:44:34 +05:30
Glenn Hermans 9de680c47d
Fix conflicts 2020-02-24 17:49:43 +01:00
Jitendra Singh 9eb7113aa4 Fixed else if indentation in javascript 2020-02-24 18:53:34 +05:30