Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please look at this and review. I am in trouble. #1

Open
wants to merge 132 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
541da9b
Revert currency-related changes to the Balance model
ffctcc Aug 15, 2014
3723e7d
Update README.md
ffctcc Aug 20, 2014
3665476
ordercomments fix
NITROjkee Sep 11, 2014
3410b90
fix with thousand_point product price
NITROjkee Sep 25, 2014
99a52cb
fix with thousand_point product price for france
NITROjkee Sep 25, 2014
0f86581
Merge branch 'master' of https://github.com/multimerch/multimerch
ffctcc Oct 20, 2014
fd2c34e
Multiple order comments fix
ffctcc Oct 20, 2014
6f5c855
One more fix to multiple comments
ffctcc Oct 22, 2014
393b34a
Admin xml modifications for OC2 - menus, transactions, temp loader ho…
ffctcc Nov 5, 2014
386341d
Merge branch 'master' of https://github.com/multimerch/multimerch
ffctcc Nov 5, 2014
acf133a
Admin base controller/seller list modifications
ffctcc Nov 7, 2014
18a505c
Fix calls to extension model
ffctcc Nov 10, 2014
1fcee06
Admin seller list/form changes
ffctcc Nov 11, 2014
9dcca41
Converting configuration/settings page to OC2 layout
ffctcc Nov 11, 2014
80c5663
Converting transaction admin pages to OC2 layout
ffctcc Nov 11, 2014
4786bab
Converting payment admin pages to OC2 layout
ffctcc Nov 11, 2014
8a66527
Converting product admin pages to OC2 layout + replacing redirect() c…
ffctcc Nov 11, 2014
5269f3a
Converting seller group admin pages to OC2 layout
ffctcc Nov 11, 2014
a817df6
Converting attribute admin pages to OC2 layout
ffctcc Nov 12, 2014
81755ed
Converting seller group admin pages to OC2 layout
ffctcc Nov 12, 2014
1bcc38f
Converting dashboard / order list pages to OC2 layout
ffctcc Nov 18, 2014
25feaa7
Converting stats / transactions pages to OC2 layout
ffctcc Nov 18, 2014
4b594db
Converting products list page to OC2 layout
ffctcc Nov 18, 2014
a4c3e1d
Converting profile account page to OC2 layout / Part1
ffctcc Nov 19, 2014
037f62e
Remove predefined avatars
ffctcc Nov 19, 2014
16f8e98
Converting profile account page to OC2 layout / Part2
ffctcc Nov 19, 2014
f185d3f
Converting payout request to OC2 layout / Part2
ffctcc Nov 19, 2014
154fb81
Converting seller account menus to OC2 layout
ffctcc Nov 20, 2014
19d9af1
Converting the rest of seller account to OpenCart2
ffctcc Nov 20, 2014
054582a
Converting catalog templates to OpenCart2 / Part1
ffctcc Nov 23, 2014
5bf2435
Converting catalog templates to OpenCart2 / Part2
ffctcc Nov 23, 2014
b1c74a9
Converting catalog templates to OpenCart2 / Part3
ffctcc Nov 24, 2014
55b1a5e
Fixed dates, updated version to MM7
ffctcc Nov 30, 2014
f3b1162
Fix various admin-area things, buttons, pretty up datatables
ffctcc Nov 30, 2014
b031a62
New seller list template, various fixes
ffctcc Dec 1, 2014
fe929e8
Various template fixes, disabled PayPal CURL verifyhost
ffctcc Dec 2, 2014
9a68510
Converting messaging to OC2
ffctcc Dec 4, 2014
51bd28d
Various 2.0 fixes
ffctcc Dec 9, 2014
d78d838
7.0.1.2
ffctcc Dec 10, 2014
1d9ef16
Converting Adaptive to OC2
ffctcc Dec 12, 2014
3c81c50
Various shipping-related fixes
ffctcc Dec 16, 2014
4ac4b52
Various OC2 fixes
ffctcc Dec 16, 2014
3c95caa
Imlement seller banners, minor fixes
ffctcc Dec 20, 2014
9b543ad
Imlement seller banners, minor fixes
ffctcc Dec 20, 2014
07edef8
Removing jQuery UI usage for progress bars and sortables. Fixing prog…
ffctcc Dec 24, 2014
4c4db53
Banner display fixes
ffctcc Dec 25, 2014
c257fde
More banner fixes, autoloading models from multimerch/ subfolder.
ffctcc Dec 29, 2014
96aaaa2
Add missing "row" container for nested columns
svetoslavatanasov Dec 30, 2014
bc819f4
Merge pull request #42 from svetoslavatanasov/patch-1
ffctcc Jan 1, 2015
9e35dee
SEO URL fixes for OC2
ffctcc Jan 6, 2015
28a6ae4
Summernote RTE fix
ffctcc Jan 6, 2015
ab1a90e
Manufacturer autocomplete fix
ffctcc Jan 6, 2015
47fce22
Rename DataTables language files to bypass .htaccess restriction
ffctcc Jan 6, 2015
82f0209
DataTables admin fix
ffctcc Jan 6, 2015
2f49984
Remove CKEDITOR installation notice since it's been changed to Summer…
ffctcc Jan 6, 2015
20e3cbe
Closing <fieldset> out of the IF statement
svetoslavatanasov Jan 7, 2015
88dc302
Update account-product-form.tpl
svetoslavatanasov Jan 7, 2015
45bed1e
Implement broken vQmod warning
ffctcc Jan 7, 2015
006875f
New bugfix version
ffctcc Jan 7, 2015
04e235d
Merge pull request #47 from svetoslavatanasov/patch-2
ffctcc Jan 7, 2015
9286129
vQmod notice fix
ffctcc Jan 7, 2015
202ae46
Signup PP fee / profile form validation fix
ffctcc Jan 12, 2015
64272e2
Signup PP fee / profile form validation fix
ffctcc Jan 12, 2015
a61a263
Sendmail fix for OC2
ffctcc Jan 13, 2015
4911a63
Dashboard currency format fixes
ffctcc Jan 14, 2015
b1b2559
Add readme
ffctcc Jan 14, 2015
4bf9956
Fix view product link on seller profile page
ffctcc Jan 21, 2015
07109a7
Fix text_empty notice
ffctcc Jan 21, 2015
e2eef7d
Delete "remaining" field for downloads as it was removed from OpenCart2
ffctcc Jan 21, 2015
f83aa9d
Remove order_download and push_downloads as it was removed from OpenC…
ffctcc Jan 21, 2015
0475c7c
Implement display order status setting
ffctcc Jan 27, 2015
113d41d
Modify Summernote RTE to refresh value before form submission instead…
ffctcc Jan 27, 2015
b834943
Rename product_option table field for OC2
ffctcc Jan 27, 2015
eb4a7f2
Minor fixes: no_image thumbnails, keeping banner proportions when res…
ffctcc Feb 3, 2015
96e27c7
Language tabs bugfix
ffctcc Feb 3, 2015
d33e2c3
Fix seller terms link, remove dummy social urls, add block end comments
ffctcc Feb 5, 2015
35026b2
Update account-order-info.tpl
svetoslavatanasov Feb 5, 2015
e4ce5b1
Simple seller signup 2.0
ffctcc Feb 5, 2015
db2de78
Merge pull request #55 from svetoslavatanasov/patch-4
ffctcc Feb 5, 2015
145ae1b
Simple seller signup 2.0
ffctcc Feb 7, 2015
c6b2bad
Merge remote-tracking branch 'origin/master'
ffctcc Feb 7, 2015
face4b7
Changes to transactions (create orderdata during order creation to di…
ffctcc Feb 7, 2015
6e88b68
Minor fixes, version 7.0.2
ffctcc Feb 9, 2015
a24b9fa
Get GH's README.md back
ffctcc Feb 12, 2015
a7feccb
Update README.md
ffctcc Feb 12, 2015
bb428f3
Fix loader magic xml, fix seller register login link, change version
ffctcc Feb 14, 2015
f5049de
Merge remote-tracking branch 'origin/master'
ffctcc Feb 14, 2015
a630e8d
Shipping/quantities fixes
ffctcc Feb 17, 2015
f8f72de
Footer/compare fixes
ffctcc Feb 19, 2015
a17083c
Delete confirmation for products/sellers/groups
ffctcc Feb 19, 2015
4e5746a
Update multimerch_core_seourl.xml
skyosev Feb 23, 2015
0aabf64
Merge pull request #61 from skyosev/patch-1
ffctcc Feb 25, 2015
c9812af
New suborder/history functionality. MsOrderData cleanup.
ffctcc Mar 1, 2015
2af24fe
Merge remote-tracking branch 'origin/master'
ffctcc Mar 1, 2015
a93ad7e
More suborder history changes
ffctcc Mar 1, 2015
eeb32ce
Fixing two-step seller registration with manual approval/paid signup …
ffctcc Mar 1, 2015
c0da8c8
Fix sellerinfos xml closing tag
ffctcc Mar 2, 2015
b6a5dac
Remove broken continue button from seller's products list
ffctcc Mar 5, 2015
159b01a
Fix payment form render catalog/admin
ffctcc Mar 8, 2015
f85bac4
Fix register-seller redirect
ffctcc Mar 8, 2015
b3719ee
Fix seller signup reviewer message
ffctcc Mar 11, 2015
b2fa91d
Fix "order updated" email being sent to seller
ffctcc Mar 12, 2015
77ad2d7
Fix seller account status notice
ffctcc Mar 14, 2015
4117995
Version 7.1
ffctcc Mar 16, 2015
209aa0a
Minor fixes - suborders, summernote
ffctcc Apr 2, 2015
6d4293a
Fix required options
ffctcc Apr 13, 2015
41ab40c
Update msattribute.php
curiousPup Apr 29, 2015
649029d
Merge pull request #78 from curiousPup/patch-1
ffctcc May 4, 2015
8b31338
Fix new admin-side payment currency format
ffctcc May 6, 2015
a7edb3a
Merge remote-tracking branch 'origin/master'
ffctcc May 6, 2015
57939cc
Fix new Mail() call for OC2020
ffctcc May 6, 2015
fac7259
Digital/shipping categories bugfix
ffctcc Jun 9, 2015
407104e
Admin/attribute textarea fix
ffctcc Jun 19, 2015
63aa1c1
Admin/seller list icons, "login as seller"
ffctcc Jun 19, 2015
caf5f47
Copy default language tags/descriptions in a multilang environment
ffctcc Jun 19, 2015
3dc9178
Seller area empty suborder validation
ffctcc Jun 19, 2015
570dd3f
Remove custom addtocart
ffctcc Jun 19, 2015
c5ed3a6
Order details fix
ffctcc Jun 19, 2015
3a95682
MM debug page, new 7.1.1 release
ffctcc Jun 20, 2015
3822b9f
Remove ms_addtocart
ffctcc Jun 20, 2015
61ad21b
7.1.2
ffctcc Jun 20, 2015
e8143cc
"Add history" language string / refresh bugs, multiline history entri…
ffctcc Jun 21, 2015
8be3137
Move Sortable.js to local
ffctcc Jun 25, 2015
89cdc93
Debug menu, shippable description fix
ffctcc Jul 2, 2015
b7c4165
Fix sellercontact dialog reloading header controller overwriting lang…
ffctcc Jul 10, 2015
c4e1de3
Remove adminFolder entities from some xml files
ffctcc Jul 10, 2015
317cdc5
Seller account product list filters
ffctcc Jul 15, 2015
2eab88f
Meta title fixes
ffctcc Aug 10, 2015
b102e42
SMTP mail fix
ffctcc Aug 14, 2015
2fd46b4
fixed product validation, meta title update, added customer group to …
ffctcc Sep 15, 2015
5b9f692
Add taxes to seller balance records
ffctcc Sep 25, 2015
9ec253e
uniformDecimalPoint fix
ffctcc Sep 28, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
New bugfix version
  • Loading branch information
ffctcc committed Jan 7, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 006875f39bf1650f2c75731d5c9fa69f3a7bae98
2 changes: 1 addition & 1 deletion upload/system/library/msloader.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

class MsLoader {
public $appVer = "7.0.1.6";
public $appVer = "7.0.1.7";
public $dbVer = "1.0.1.0";

public function __construct($registry) {