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

81 Commits

Author SHA1 Message Date
merdan ae72375120 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	composer.json
	composer.lock
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
 2022-07-25 16:09:17 +05:00
merdan a4b1fe4840 Revert "server-folder-permissions" 
This reverts commit a8c31e1a44.
 2022-07-25 15:49:44 +05:00
jitendra e1a0c0b8c6 Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30
Your Name 408a08d012 Merge branch 'sarga-v1' of gitlab.com:merdan.m/bagisto into sarga-v1 2022-05-13 16:17:48 +05:00
Your Name a8c31e1a44 server-folder-permissions 2022-05-13 16:01:33 +05:00
merdan 54636be4e0 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	packages/Webkul/Shipping/src/Shipping.php
 2022-05-13 15:52:25 +05:00
Devansh a93c4945fb Shipping File Updated 2022-05-04 18:30:45 +05:30
merdan 105a2c758b sort fixing 2022-04-16 11:01:51 +05:00
merdan 789acc413d shipping fix 2022-03-01 16:19:06 +05:00
merdan fc982d507b cart product adn super attributes 2022-03-01 14:01:46 +05:00
Devansh 2c45b1db11 Syntax Fixed 2022-02-11 16:25:49 +05:30
Devansh d7834ff66e Reverted #4360 2022-02-11 16:22:06 +05:30
Devansh c9b60b2c10 Squashed All Commits 2022-02-01 16:44:16 +05:30
Devansh f3902b94a3 Fixed With Proper Consistensy 2022-01-06 09:37:26 +05:30
Devansh 9dc8e07ce0 Rates Reset 2021-11-25 16:55:19 +05:30
Devansh 7dd15aaa14 Shipping Package Improved 2021-11-09 13:24:48 +05:30
Devansh e7da9ed9f6
Merge pull request #5306 from AmooAti/shipping-method-validation 
Shipping method validation
 2021-11-09 12:17:43 +05:30
AmooAti 84431fa4bc doc type and style 2021-11-08 16:22:58 +03:30
AmooAti 154808b181 add method to shipping method attributes and better approach for checking if shipping method is available 2021-11-08 11:15:12 +03:30
Devansh 40e46e0a87 Configuration Fixed 2021-11-08 12:48:11 +05:30
Devansh 3576a6e5b1 Added Select Type 2021-11-08 12:44:44 +05:30
Seyed AmirHossein Adhami MirHosseini 0d532690bf
remove unused namespace 2021-11-07 10:22:03 +03:30
Seyed AmirHossein Adhami MirHosseini de9ffad40d
typo fixed 
config key has a typo.
 2021-11-07 10:09:18 +03:30
devansh bawari 88782d9327 Language Translation Added 😇 2020-12-18 17:02:55 +05:30
devansh bawari 179c59b2de Option Added For Tax Calculation 2020-12-18 13:00:13 +05:30
devansh bawari fe96926179 Changes Added Which Has Been Reverted 2020-11-25 18:28:21 +05:30
jitendra 711beb1786 Added Bagisto Debugbar 2020-11-24 17:48:37 +05:30
devansh bawari 6c211183a1 Added On The Basis Of Status 2020-11-09 20:07:27 +05:30
devansh bawari 433225ad81 Required Field Depend On Status 2020-11-09 14:20:32 +05:30
Devansh cc425ad13a Two Seperate Form Merged 2020-08-28 00:09:28 +05:30
Devansh 724e823b99 Handled One Test Case 2020-07-29 17:44:48 +05:30
Florian Bosdorff 01d4cb026f fix address_type at many places; add tests for address relations 2020-04-17 11:09:59 +02:00
Jitendra Singh 10db1838f2 Removed author information from every class 2020-03-05 19:28:42 +05:30
Jitendra Singh 92261d4214 Improved comments in code 2020-03-05 19:07:08 +05:30
Jitendra Singh 41e06d5dc5 Improved code style 2020-03-04 12:02:53 +05:30
Jitendra Singh 05be7a070a Improved code style 2020-02-27 13:33:03 +05:30
Jitendra Singh a4d565e46e Improved shipping package code style 2020-02-20 12:24:38 +05:30
Jitendra Singh 881027ca4e Converted configuration boolean type to switch 2020-02-12 13:45:26 +05:30
Jitendra Singh 002a977e22 Issue #2417 fixed 2020-02-11 15:02:04 +05:30
Jitendra Singh e0c7081bd3 Issue #1777 fixed 2020-01-10 19:27:16 +05:30
jitendra 5e754cbdfe Resoloved conflicts 2019-10-09 17:12:57 +05:30
rahul shukla d27dfd1c1e change way for default shipping & payment method selection 2019-10-01 16:26:49 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
Prashant Singh 852a6b91af More normalization added in cart rule actions for FixedAmount & PercetnOfProduct 2019-08-22 11:05:25 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Prashant Singh 5f08f2b9f4 Fixed sort order for configuration in admin panel 2019-07-14 00:46:33 +05:30
Prashant Singh 7ffbee95ad Shipping methods and payment methods description converted to translation string 2019-07-11 10:16:58 +05:30
jitendra f529a128cd Removed unnecessary code from sevice providers 2019-07-01 20:03:16 +05:30