Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: fecshop/yii2_fecshop
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.13.4
Choose a base ref
...
head repository: fecshop/yii2_fecshop
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on May 31, 2021

  1. Copy the full SHA
    80c8985 View commit details

Commits on Jun 3, 2021

  1. Remove unused import.

    undefinedor committed Jun 3, 2021
    Copy the full SHA
    3130062 View commit details

Commits on Jun 4, 2021

  1. Copy the full SHA
    4d3c7fa View commit details
  2. Merge pull request #97 from undefinedor/remove-unused-import

    Remove unused import.
    fancyecommerce authored Jun 4, 2021
    Copy the full SHA
    a230a87 View commit details

Commits on Jun 10, 2021

  1. admin paypal config

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    05ac509 View commit details
  2. paypal

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    a5620a4 View commit details
  3. h5 paypal

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    9874000 View commit details
  4. paypalCart service

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    f3f2301 View commit details
  5. Copy the full SHA
    431d168 View commit details
  6. version

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    ea9d595 View commit details
  7. migration

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    304e988 View commit details
  8. paypal services

    fancyecommerce committed Jun 10, 2021
    Copy the full SHA
    63cdeb1 View commit details
  9. Copy the full SHA
    ae7c7e1 View commit details

Commits on Jun 16, 2021

  1. event services

    fancyecommerce committed Jun 16, 2021
    Copy the full SHA
    6faa1c8 View commit details
  2. Copy the full SHA
    d58715c View commit details

Commits on Jun 18, 2021

  1. Copy the full SHA
    d856560 View commit details
  2. order services

    fancyecommerce committed Jun 18, 2021
    Copy the full SHA
    50e9297 View commit details
  3. payment success

    fancyecommerce committed Jun 18, 2021
    Copy the full SHA
    6571d00 View commit details
  4. services/

    fancyecommerce committed Jun 18, 2021
    Copy the full SHA
    6521b96 View commit details

Commits on Jun 24, 2021

  1. lang

    fancyecommerce committed Jun 24, 2021
    Copy the full SHA
    d139235 View commit details
  2. css update

    fancyecommerce committed Jun 24, 2021
    Copy the full SHA
    cac48c6 View commit details
  3. Copy the full SHA
    7fda7f1 View commit details
  4. 2.15.1

    fancyecommerce committed Jun 24, 2021
    Copy the full SHA
    bc6b41d View commit details
  5. Copy the full SHA
    8e21351 View commit details
  6. Copy the full SHA
    07125b1 View commit details
  7. Copy the full SHA
    193d582 View commit details
  8. category

    fancyecommerce committed Jun 24, 2021
    Copy the full SHA
    03a99b3 View commit details

Commits on Jun 29, 2021

  1. Copy the full SHA
    2115aa8 View commit details
  2. product brand services

    fancyecommerce committed Jun 29, 2021
    Copy the full SHA
    e87fb25 View commit details
  3. order item services

    fancyecommerce committed Jun 29, 2021
    Copy the full SHA
    8b11148 View commit details
  4. Copy the full SHA
    68ce062 View commit details
  5. Copy the full SHA
    e13c39d View commit details
  6. rewrite yii\web\View

    fancyecommerce committed Jun 29, 2021
    Copy the full SHA
    e815531 View commit details
  7. Copy the full SHA
    063d174 View commit details
  8. Copy the full SHA
    03bd753 View commit details
  9. Copy the full SHA
    04f0a78 View commit details

Commits on Jul 1, 2021

  1. yii/web/View

    fancyecommerce committed Jul 1, 2021
    Copy the full SHA
    7824d2f View commit details
  2. page trace services

    fancyecommerce committed Jul 1, 2021
    Copy the full SHA
    08f5a0d View commit details
  3. lang

    fancyecommerce committed Jul 1, 2021
    Copy the full SHA
    ad32788 View commit details
  4. cms home

    fancyecommerce committed Jul 1, 2021
    Copy the full SHA
    4406c4c View commit details
  5. Copy the full SHA
    4265c0a View commit details
  6. version

    fancyecommerce committed Jul 1, 2021
    Copy the full SHA
    79a2dc8 View commit details

Commits on Jul 5, 2021

  1. Copy the full SHA
    615c7e4 View commit details
  2. widgets trace

    fancyecommerce committed Jul 5, 2021
    Copy the full SHA
    2b9e1ee View commit details
  3. add lang translate

    fancyecommerce committed Jul 5, 2021
    Copy the full SHA
    bc35d4a View commit details
  4. widget trace

    fancyecommerce committed Jul 5, 2021
    Copy the full SHA
    cd9d1e2 View commit details
  5. Copy the full SHA
    6042dd5 View commit details

Commits on Jul 7, 2021

  1. lang translate

    fancyecommerce committed Jul 7, 2021
    Copy the full SHA
    202fd72 View commit details
  2. version

    fancyecommerce committed Jul 7, 2021
    Copy the full SHA
    9b13178 View commit details

Commits on Jul 9, 2021

  1. 加入库包

    fancyecommerce committed Jul 9, 2021
    Copy the full SHA
    7d7091f View commit details
Showing with 4,174 additions and 2,236 deletions.
  1. +1 −0 SECURITY.md
  2. +16 −10 app/appadmin/languages/zh-CN/appadmin.php
  3. +6 −7 app/appadmin/modules/AppadminController.php
  4. +1 −2 app/appadmin/modules/Catalog/CatalogController.php
  5. +15 −3 app/appadmin/modules/Catalog/block/category/Product.php
  6. +16 −32 app/appadmin/modules/Catalog/block/categoryupload/Manager.php
  7. +5 −6 app/appadmin/modules/Catalog/block/productattr/Manager.php
  8. +2 −3 app/appadmin/modules/Catalog/block/productattrgroup/Manager.php
  9. +11 −12 app/appadmin/modules/Catalog/block/productbrand/Manager.php
  10. +7 −9 app/appadmin/modules/Catalog/block/productbrandcategory/Manager.php
  11. +34 −36 app/appadmin/modules/Catalog/block/productupload/Manager.php
  12. +2 −3 app/appadmin/modules/Cms/CmsController.php
  13. +3 −1 app/appadmin/modules/Cms/block/article/Manageredit.php
  14. +2 −3 app/appadmin/modules/Config/ConfigController.php
  15. +20 −4 app/appadmin/modules/Config/block/appfrontpayment/Manager.php
  16. +3 −4 app/appadmin/modules/Config/block/appfrontstore/Manager.php
  17. +15 −12 app/appadmin/modules/Config/block/apphtml5payment/Manager.php
  18. +3 −4 app/appadmin/modules/Config/block/apphtml5store/Manager.php
  19. +16 −11 app/appadmin/modules/Config/block/appserverpayment/Manager.php
  20. +19 −23 app/appadmin/modules/Config/block/appserverstorelang/Manager.php
  21. +18 −22 app/appadmin/modules/Config/block/categorysort/Manager.php
  22. +19 −23 app/appadmin/modules/Config/block/currency/Manager.php
  23. +20 −24 app/appadmin/modules/Config/block/mutillang/Manager.php
  24. +26 −2 app/appadmin/modules/Config/block/paymentpaypal/Manager.php
  25. +1 −2 app/appadmin/modules/Config/controllers/AppfrontstoreController.php
  26. +1 −2 app/appadmin/modules/Config/controllers/Apphtml5storeController.php
  27. +2 −3 app/appadmin/modules/Customer/CustomerController.php
  28. +16 −17 app/appadmin/modules/Fecadmin/block/log/Index.php
  29. +27 −28 app/appadmin/modules/Fecadmin/block/logtj/Index.php
  30. +5 −5 app/appadmin/modules/Fecadmin/block/myaccount/Index.php
  31. +11 −14 app/appadmin/modules/Fecadmin/controllers/AccountController.php
  32. +4 −6 app/appadmin/modules/Fecadmin/controllers/CacheController.php
  33. +8 −11 app/appadmin/modules/Fecadmin/controllers/ConfigController.php
  34. +5 −7 app/appadmin/modules/Fecadmin/controllers/ErrorController.php
  35. +7 −9 app/appadmin/modules/Fecadmin/controllers/IndexController.php
  36. +3 −6 app/appadmin/modules/Fecadmin/controllers/LogController.php
  37. +8 −12 app/appadmin/modules/Fecadmin/controllers/LoginController.php
  38. +5 −11 app/appadmin/modules/Fecadmin/controllers/LogoutController.php
  39. +2 −5 app/appadmin/modules/Fecadmin/controllers/LogtjController.php
  40. +2 −5 app/appadmin/modules/Fecadmin/controllers/MyaccountController.php
  41. +1 −4 app/appadmin/modules/Fecadmin/controllers/ResourceController.php
  42. +0 −3 app/appadmin/modules/Fecadmin/controllers/RoleController.php
  43. +5 −8 app/appadmin/modules/Fecadmin/controllers/SystemlogController.php
  44. +1 −2 app/appadmin/modules/Sales/SalesController.php
  45. +23 −24 app/appadmin/modules/Sales/block/orderinfo/Manageredit.php
  46. +2 −3 app/appadmin/modules/System/SystemController.php
  47. +5 −9 app/appadmin/modules/System/block/adminurlkey/Manager.php
  48. +1 −1 app/appadmin/modules/System/block/error/Index.php
  49. +3 −7 app/appadmin/modules/System/block/error/Manageredit.php
  50. +5 −9 app/appadmin/modules/System/block/extensiongii/Manager.php
  51. +6 −10 app/appadmin/modules/System/block/extensionmarket/Login.php
  52. +29 −33 app/appadmin/modules/System/block/extensionmarket/Manager.php
  53. +7 −8 app/appadmin/modules/System/controllers/ExtensioninstalledController.php
  54. +3 −1 app/appadmin/theme/base/default/assets/css/appadmin.css
  55. +5 −3 app/appadmin/theme/base/default/catalog/category/index.php
  56. +4 −40 app/appadmin/theme/base/default/catalog/category/product.php
  57. +22 −22 app/appadmin/theme/base/default/catalog/productattr/manageredit.php
  58. +19 −19 app/appadmin/theme/base/default/catalog/productattrgroup/manageredit.php
  59. +8 −9 app/appadmin/theme/base/default/catalog/productbrand/manageredit.php
  60. +7 −7 app/appadmin/theme/base/default/catalog/productbrandcategory/manageredit.php
  61. +53 −53 app/appadmin/theme/base/default/catalog/productinfo/managerbatchedit.php
  62. +36 −36 app/appadmin/theme/base/default/catalog/productinfo/manageredit.php
  63. +17 −17 app/appadmin/theme/base/default/catalog/productreview/manageredit.php
  64. +6 −6 app/appadmin/theme/base/default/cms/article/manageredit.php
  65. +8 −8 app/appadmin/theme/base/default/cms/staticblock/manageredit.php
  66. +9 −9 app/appadmin/theme/base/default/config/appfrontaccount/manager.php
  67. +9 −9 app/appadmin/theme/base/default/config/appfrontbase/manager.php
  68. +9 −9 app/appadmin/theme/base/default/config/appfrontcache/manager.php
  69. +9 −9 app/appadmin/theme/base/default/config/appfrontcatalog/manager.php
  70. +9 −9 app/appadmin/theme/base/default/config/appfronthome/manager.php
  71. +9 −9 app/appadmin/theme/base/default/config/appfrontpayment/manager.php
  72. +25 −25 app/appadmin/theme/base/default/config/appfrontstore/manageredit.php
  73. +9 −9 app/appadmin/theme/base/default/config/apphtml5account/manager.php
  74. +9 −9 app/appadmin/theme/base/default/config/apphtml5base/manager.php
  75. +9 −9 app/appadmin/theme/base/default/config/apphtml5cache/manager.php
  76. +9 −9 app/appadmin/theme/base/default/config/apphtml5catalog/manager.php
  77. +9 −9 app/appadmin/theme/base/default/config/apphtml5home/manager.php
  78. +9 −9 app/appadmin/theme/base/default/config/apphtml5payment/manager.php
  79. +24 −24 app/appadmin/theme/base/default/config/apphtml5store/manageredit.php
  80. +9 −9 app/appadmin/theme/base/default/config/appserveraccount/manager.php
  81. +9 −9 app/appadmin/theme/base/default/config/appserverbase/manager.php
  82. +9 −9 app/appadmin/theme/base/default/config/appservercache/manager.php
  83. +9 −9 app/appadmin/theme/base/default/config/appservercatalog/manager.php
  84. +9 −9 app/appadmin/theme/base/default/config/appserverhome/manager.php
  85. +9 −9 app/appadmin/theme/base/default/config/appserverpayment/manager.php
  86. +9 −9 app/appadmin/theme/base/default/config/appserverstore/manager.php
  87. +30 −30 app/appadmin/theme/base/default/config/appserverstorelang/manager.php
  88. +10 −10 app/appadmin/theme/base/default/config/base/manager.php
  89. +9 −9 app/appadmin/theme/base/default/config/cart/manager.php
  90. +22 −22 app/appadmin/theme/base/default/config/categorysort/manager.php
  91. +19 −19 app/appadmin/theme/base/default/config/currency/manager.php
  92. +9 −9 app/appadmin/theme/base/default/config/email/manager.php
  93. +10 −10 app/appadmin/theme/base/default/config/fa/manager.php
  94. +30 −30 app/appadmin/theme/base/default/config/mutillang/manager.php
  95. +9 −9 app/appadmin/theme/base/default/config/order/manager.php
  96. +9 −9 app/appadmin/theme/base/default/config/paymentalipay/manager.php
  97. +19 −9 app/appadmin/theme/base/default/config/paymentpaypal/manager.php
  98. +9 −9 app/appadmin/theme/base/default/config/paymentwxpay/manager.php
  99. +9 −9 app/appadmin/theme/base/default/config/product/manager.php
  100. +9 −9 app/appadmin/theme/base/default/config/search/manager.php
  101. +9 −9 app/appadmin/theme/base/default/config/service/db.php
  102. +9 −9 app/appadmin/theme/base/default/customer/account/manageredit.php
  103. +10 −10 app/appadmin/theme/base/default/customer/contacts/manageredit.php
  104. +13 −13 app/appadmin/theme/base/default/fecadmin/account/manageredit.php
  105. +8 −8 app/appadmin/theme/base/default/fecadmin/config/manageredit.php
  106. +2 −2 app/appadmin/theme/base/default/fecadmin/resource/manageredit.php
  107. +2 −3 app/appadmin/theme/base/default/fecadmin/role/manageredit.php
  108. +27 −30 app/appadmin/theme/base/default/layouts/dashboard.php
  109. +12 −14 app/appadmin/theme/base/default/layouts/login.php
  110. +9 −9 app/appadmin/theme/base/default/sales/coupon/manageredit.php
  111. +52 −53 app/appadmin/theme/base/default/sales/orderinfo/manageredit.php
  112. +12 −12 app/appadmin/theme/base/default/system/adminurlkey/manager.php
  113. +8 −11 app/appadmin/theme/base/default/system/error/manageredit.php
  114. +19 −19 app/appadmin/theme/base/default/system/extensiongii/manager.php
  115. +7 −7 app/appadmin/theme/base/default/system/extensioninstalled/manageredit.php
  116. +8 −8 app/appadmin/theme/base/default/system/extensioninstalled/managerview.php
  117. +9 −9 app/appadmin/theme/base/default/system/extensionmarket/login.php
  118. +2 −7 app/appapi/modules/AppapiController.php
  119. +31 −35 app/appapi/modules/AppapiTokenController.php
  120. +1 −2 app/appapi/modules/V1/Module.php
  121. +1 −1 app/appapi/modules/V1/controllers/CategoryController.php
  122. +3 −4 app/appapi/modules/V1/controllers/HomeController.php
  123. +3 −0 app/appfront/config/appfront.php
  124. +1 −1 app/appfront/languages/it-IT/appfront.php
  125. +2 −1 app/appfront/modules/Catalog/block/category/Index.php
  126. +1 −0 app/appfront/modules/Catalog/block/product/Index.php
  127. +1 −0 app/appfront/modules/Catalogsearch/block/index/Index.php
  128. +9 −0 app/appfront/modules/Checkout/block/onepage/Placeorder.php
  129. +72 −0 app/appfront/modules/Checkout/controllers/ReorderController.php
  130. +2 −3 app/appfront/modules/Cms/block/article/Index.php
  131. +1 −1 app/appfront/modules/Cms/block/home/Index.php
  132. +1 −1 app/appfront/modules/Customer/block/account/Register.php
  133. +37 −29 app/appfront/modules/Customer/controllers/TestController.php
  134. +9 −2 app/appfront/modules/Payment/block/paypal/express/Review.php
  135. +25 −0 app/appfront/modules/Payment/block/paypal/express/Start.php
  136. +11 −0 app/appfront/modules/Payment/block/paypal/standard/Start.php
  137. +2 −2 app/appfront/modules/Payment/block/success/Index.php
  138. +11 −3 app/appfront/modules/Payment/controllers/paypal/ExpressController.php
  139. +3 −2 app/appfront/modules/Payment/controllers/paypal/StandardController.php
  140. +27 −1 app/appfront/theme/base/front/catalog/category/index.php
  141. +76 −73 app/appfront/theme/base/front/catalog/product/index.php
  142. +30 −0 app/appfront/theme/base/front/catalog/product/index/image.php
  143. +26 −1 app/appfront/theme/base/front/catalogsearch/index/index.php
  144. +39 −6 app/appfront/theme/base/front/checkout/cart/index.php
  145. +74 −72 app/appfront/theme/base/front/checkout/onepage/index.php
  146. +1 −1 app/appfront/theme/base/front/checkout/onepage/index/payment.php
  147. +2 −0 app/appfront/theme/base/front/cms/home/index.php
  148. +1 −1 app/appfront/theme/base/front/cms/home/index/product.php
  149. +0 −1 app/appfront/theme/base/front/layouts/home.php
  150. +5 −2 app/appfront/theme/base/front/payment/paypal/express/review.php
  151. +4 −1 app/appfront/theme/base/front/payment/success/index.php
  152. +1 −3 app/appfront/theme/base/front/site/helper/error.php
  153. +1 −1 app/appfront/theme/base/front/widgets/trace.php
  154. +3 −0 app/apphtml5/config/apphtml5.php
  155. +2 −1 app/apphtml5/modules/Catalog/block/category/Index.php
  156. +2 −0 app/apphtml5/modules/Catalog/block/product/Index.php
  157. +1 −0 app/apphtml5/modules/Catalogsearch/block/index/Index.php
  158. +9 −0 app/apphtml5/modules/Checkout/block/onepage/Placeorder.php
  159. +1 −0 app/apphtml5/modules/Cms/block/home/Index.php
  160. +9 −2 app/apphtml5/modules/Payment/block/paypal/express/Review.php
  161. +23 −0 app/apphtml5/modules/Payment/block/paypal/express/Start.php
  162. +9 −0 app/apphtml5/modules/Payment/block/paypal/standard/Start.php
  163. +2 −2 app/apphtml5/modules/Payment/block/success/Index.php
  164. +9 −2 app/apphtml5/modules/Payment/controllers/paypal/ExpressController.php
  165. +1 −1 app/apphtml5/modules/Payment/controllers/paypal/StandardController.php
  166. +22 −21 app/apphtml5/theme/base/html5/catalog/category/index.php
  167. +71 −68 app/apphtml5/theme/base/html5/catalog/product/index.php
  168. +28 −2 app/apphtml5/theme/base/html5/catalog/product/index/image.php
  169. +23 −23 app/apphtml5/theme/base/html5/catalog/reviewproduct/add.php
  170. +19 −19 app/apphtml5/theme/base/html5/catalogsearch/index/index.php
  171. +43 −8 app/apphtml5/theme/base/html5/checkout/cart/index.php
  172. +81 −80 app/apphtml5/theme/base/html5/checkout/onepage/index.php
  173. +1 −0 app/apphtml5/theme/base/html5/cms/home/index.php
  174. +27 −1 app/apphtml5/theme/base/html5/cms/home/index/product.php
  175. +8 −9 app/apphtml5/theme/base/html5/customer/productfavorite/index.php
  176. +8 −10 app/apphtml5/theme/base/html5/customer/productreview/index.php
  177. +5 −2 app/apphtml5/theme/base/html5/payment/paypal/express/review.php
  178. +2 −1 app/apphtml5/theme/base/html5/payment/success/index.php
  179. +1 −3 app/apphtml5/theme/base/html5/site/helper/error.php
  180. +1 −1 app/apphtml5/theme/base/html5/widgets/trace.php
  181. +52 −53 app/appinstall/modules/Database/controllers/ConfigController.php
  182. +0 −2 app/appinstall/modules/Database/controllers/ErrorController.php
  183. +6 −7 app/appinstall/modules/Database/views/config/migratesuccess.php
  184. +22 −25 app/appinstall/modules/Database/views/config/readme.php
  185. +1 −3 app/appinstall/modules/Database/views/error/index.php
  186. +42 −47 app/appserver/modules/AppserverTokenController.php
  187. +26 −27 app/appserver/modules/Catalog/controllers/ReviewproductController.php
  188. +9 −0 app/appserver/modules/Checkout/block/onepage/Placeorder.php
  189. +9 −0 app/appserver/modules/Checkout/block/onepage/Wxplaceorder.php
  190. +1 −1 app/appserver/modules/Checkout/controllers/CartController.php
  191. +7 −8 app/appserver/modules/Wx/controllers/HelperController.php
  192. +7 −8 app/console/modules/Amqp/controllers/TestController.php
  193. +46 −47 app/console/modules/ConsoleController.php
  194. +18 −19 app/console/modules/ConsoleModule.php
  195. +1 −1 app/console/modules/Order/controllers/ItemController.php
  196. +0 −1 app/console/modules/Product/controllers/IndexController.php
  197. +1 −0 composer.json
  198. +3 −0 config/services/Payment.php
  199. +1 −1 migrations/mysqldb/m190809_154516_fecshop_tables.php
  200. +52 −0 migrations/mysqldb/m210618_022236_fecshop_tables.php
  201. +52 −0 migrations/mysqldb/m210805_024643_fecshop_tables.php
  202. +5 −5 models/mongodb/Product.php
  203. +2 −0 services/Application.php
  204. +35 −3 services/Event.php
  205. +25 −2 services/FecshopLang.php
  206. +88 −1 services/Helper.php
  207. +73 −3 services/Order.php
  208. +5 −0 services/Product.php
  209. +28 −0 services/StoreDomain.php
  210. +11 −1 services/Url.php
  211. +3 −0 services/category/Product.php
  212. +1 −1 services/email/views/order/create/logined/body_en.php
  213. +1 −1 services/email/views/order/create/logined/body_zh.php
  214. +313 −1 services/helper/Country.php
  215. +184 −12 services/helper/ZipFile.php
  216. +1 −0 services/order/Item.php
  217. +29 −0 services/page/Asset.php
  218. +10 −0 services/page/Currency.php
  219. +132 −49 services/page/Trace.php
  220. +48 −1 services/payment/Paypal.php
  221. +338 −0 services/payment/PaypalCart.php
  222. +4 −0 services/product/AttrGroup.php
  223. +13 −0 services/product/Brand.php
  224. +7 −7 services/product/ProductApi.php
  225. +22 −0 services/product/ProductMongodb.php
  226. +42 −6 services/product/ProductMysqldb.php
  227. +31 −0 services/product/attrgroup/AttrGroupMysqldb.php
  228. +138 −0 yii/web/View.php
1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

26 changes: 16 additions & 10 deletions app/appadmin/languages/zh-CN/appadmin.php
Original file line number Diff line number Diff line change
@@ -884,16 +884,22 @@
'Third Refer Url' => '外部来源',
'Third Refer Code' => '外部编码',
'Third Product Code' => '第三方货号',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'' => '',
'Priority' => '优先级',
'Social Config' => '社交平台配置',
'Social Feed' => '社交平台Feed',

'Ga Config' => 'GA配置',
'LiveChat Config' => '在线聊天配置',

'Livechat Js Code' => '在线聊天Js代码',
'FbPixel Config' => 'Facebook像素配置',
'FbPixel Code' => 'Facebook像素js代码',
'Base Shipping Config' => '基础快递配置',
'Shipping Label' => '快递名称',
'Is Default' => '是否默认',
'Weight Above(g)' => '重量高于(克)?',
'Shipping Cost(Base Currency)' => '运费(基础货币)',
'Default' => '默认',
'' => '',
'' => '',
'' => '',
13 changes: 6 additions & 7 deletions app/appadmin/modules/AppadminController.php
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@

namespace fecshop\app\appadmin\modules;

use fec\controllers\FecController;
use fec\helpers\CConfig;
use Yii;
use yii\base\InvalidValueException;
@@ -23,7 +22,7 @@ class AppadminController extends Controller
{
public $blockNamespace;
public $enableCsrfValidation = true;

/**
* init theme component property : $fecshopThemeDir and $layoutFile
* $fecshopThemeDir is appfront base theme directory.
@@ -82,7 +81,7 @@ public function beforeAction($action)

return false;
}


/**
* @param $view|string , (only) view file name ,by this module id, this controller id , generate view relative path.
@@ -117,7 +116,7 @@ public function findLayoutFile($view)
}
throw new InvalidValueException('layout file is not exist!');
}

public function getFecadminBlock($blockname=''){
$_currentNameSpace = \fec\helpers\CModule::param("_currentNameSpace");
//echo $_currentNameSpace;exit;
@@ -136,16 +135,16 @@ public function getFecadminBlock($blockname=''){
}else{
$url_key_arr[count($url_key_arr)-1] = ucfirst($url_key_arr[count($url_key_arr)-1]);
}

$block_space = implode("\\",$url_key_arr);
$blockFile = $modulesDir.$block_space;
//查找是否在rewriteMap中存在重写
//$relativeFile = Yii::mapGetName($relativeFile);
$blockFile = Yii::mapGetName($blockFile);
//echo $blockFile;exit;

return new $blockFile;

}

public function getBlock($blockName = ''){
3 changes: 1 addition & 2 deletions app/appadmin/modules/Catalog/CatalogController.php
Original file line number Diff line number Diff line change
@@ -13,8 +13,7 @@
* @author Terry Zhao <2358269014@qq.com>
* @since 1.0
*/
use fecadmin\FecadminbaseController;
use Yii;

use fecshop\app\appadmin\modules\AppadminController;

class CatalogController extends AppadminController
18 changes: 15 additions & 3 deletions app/appadmin/modules/Catalog/block/category/Product.php
Original file line number Diff line number Diff line change
@@ -107,14 +107,26 @@ public function getToolBar($numCount, $pageNum, $numPerPage)
*/
public function getSearchArr()
{
$data = [
[ // 字符串类型
$nameInput = [];
if (Yii::$service->product->serviceStorageName() == 'mongodb') {
$nameInput = [ // 字符串类型
'type' => 'inputtext',
'title' => 'Name',
'name' => 'name',
'columns_type' => 'string',
'lang' => true,
],
];
} else {
$nameInput = [ // 字符串类型
'type' => 'inputtext',
'title' => 'Name',
'name' => 'name',
'columns_type' => 'string',
'lang' => false,
];
}
$data = [
$nameInput,
[ // 字符串类型
'type' => 'inputtext',
'title' => Yii::$service->page->translate->__('Spu'),
48 changes: 16 additions & 32 deletions app/appadmin/modules/Catalog/block/categoryupload/Manager.php
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@

namespace fecshop\app\appadmin\modules\Catalog\block\categoryupload;

use fecshop\app\appadmin\interfaces\base\AppadminbaseBlockInterface;
use fecshop\app\appadmin\modules\AppadminbaseBlock;
use Yii;
use yii\base\BaseObject;

@@ -21,7 +19,7 @@
*/
class Manager extends BaseObject
{

public $_fileFullDir;
/**
* init param function ,execute in construct.
@@ -39,14 +37,14 @@ public function getLastData()
return [
];
}


public function uploadCategory()
{
$fileFullDir = Yii::getAlias('@appadmin/runtime/upload/');
if ($this->saveUploadExcelFile($fileFullDir)) {
//echo $this->_fileFullDir;

$arr = \fec\helpers\CExcel::getExcelContent($this->_fileFullDir);
$i = 0;
if (is_array($arr) && !empty($arr)) {
@@ -71,9 +69,9 @@ public function uploadCategory()
]);
exit;
}

}

public function saveCategory($one)
{
// 从excel中获取数据。
@@ -93,22 +91,22 @@ public function saveCategory($one)
$meta_description = $one['K'];
$image = $one['L'];
$thumbnail_image = $one['M'];


$nameLang = Yii::$service->fecshoplang->getLangAttrName('name',$language_code);
$titleLang = Yii::$service->fecshoplang->getLangAttrName('title',$language_code);
$metaKeywordsLang = Yii::$service->fecshoplang->getLangAttrName('meta_keywords',$language_code);
$metaDescriptionLang = Yii::$service->fecshoplang->getLangAttrName('meta_description',$language_code);
$descriptionLang = Yii::$service->fecshoplang->getLangAttrName('description',$language_code);

$categoryPrimaryKey = Yii::$service->category->getPrimaryKey();
//$categoryMode = Yii::$service->category->getByPrimarykey($category_id);
//$categoryPrimaryKey = Yii::$service->category->getPrimaryKey();
//$category_id = '';
//if ($categoryMode && isset($categoryMode[$categoryPrimaryKey]) && $categoryMode[$categoryPrimaryKey]) {
// $category_id = $categoryMode[$categoryPrimaryKey];
//}

$categoryArr[$categoryPrimaryKey] = $category_id;
$categoryArr['parent_id'] = $parent_id;
$categoryArr['name'][$nameLang] = $category_name;
@@ -121,37 +119,23 @@ public function saveCategory($one)
$categoryArr['meta_description'][$metaDescriptionLang] = $meta_description;
$categoryArr['image'] = $image;
$categoryArr['thumbnail_image'] = $thumbnail_image;

return Yii::$service->category->excelSave($categoryArr);
}

# 1.保存前台上传的文件。
public function saveUploadExcelFile($fileFullDir){

$name = $_FILES["file"]["name"];
$fileFullDir .= 'category_'.time().'_'.rand(1000,9999);
if(strstr($name,'.xlsx')){
$fileFullDir .='.xlsx';
} else if (strstr($name,'.xls')){
$fileFullDir .='.xls';
}
$this->_fileFullDir = $fileFullDir;
}
$this->_fileFullDir = $fileFullDir;
$result = @move_uploaded_file($_FILES["file"]["tmp_name"],$fileFullDir);

return $result;
}














}
11 changes: 5 additions & 6 deletions app/appadmin/modules/Catalog/block/productattr/Manager.php
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
namespace fecshop\app\appadmin\modules\Catalog\block\productattr;

use fec\helpers\CUrl;
use fec\helpers\CRequest;
use fecshop\app\appadmin\interfaces\base\AppadminbaseBlockInterface;
use fecshop\app\appadmin\modules\AppadminbaseBlock;
use Yii;
@@ -81,7 +80,7 @@ public function getSearchArr()
2 => Yii::$service->page->translate->__('Disable'),
],
],

];

return $data;
@@ -112,7 +111,7 @@ public function getTableFieldArr()
'width' => '110',
'align' => 'left',
],

[
'orderField' => 'status',
'label' => Yii::$service->page->translate->__('Status'),
@@ -123,14 +122,14 @@ public function getTableFieldArr()
2 => Yii::$service->page->translate->__('Disable'),
],
],

[
'orderField' => 'db_type',
'label' => Yii::$service->page->translate->__('Db Type'),
'width' => '110',
'align' => 'center',
],

[
'orderField' => 'show_as_img',
'label' => Yii::$service->page->translate->__('Show As Img'),
@@ -141,7 +140,7 @@ public function getTableFieldArr()
2 => Yii::$service->page->translate->__('No'),
],
],

[
'orderField' => 'display_type',
'label' => Yii::$service->page->translate->__('Display Type'),
Original file line number Diff line number Diff line change
@@ -10,7 +10,6 @@
namespace fecshop\app\appadmin\modules\Catalog\block\productattrgroup;

use fec\helpers\CUrl;
use fec\helpers\CRequest;
use fecshop\app\appadmin\interfaces\base\AppadminbaseBlockInterface;
use fecshop\app\appadmin\modules\AppadminbaseBlock;
use Yii;
@@ -81,7 +80,7 @@ public function getSearchArr()
2 => Yii::$service->page->translate->__('Disable'),
],
],

];

return $data;
@@ -115,7 +114,7 @@ public function getTableFieldArr()
2 => Yii::$service->page->translate->__('Disable'),
],
],

[
'orderField' => 'created_at',
'label' => Yii::$service->page->translate->__('Created At'),
23 changes: 11 additions & 12 deletions app/appadmin/modules/Catalog/block/productbrand/Manager.php
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@

namespace fecshop\app\appadmin\modules\Catalog\block\productbrand;

use fec\helpers\CUrl;
use fec\helpers\CRequest;
use fecshop\app\appadmin\interfaces\base\AppadminbaseBlockInterface;
use fecshop\app\appadmin\modules\AppadminbaseBlock;
@@ -82,7 +81,7 @@ public function getSearchArr()
2 => Yii::$service->page->translate->__('Disable'),
],
],

[ // 时间区间类型搜索
'type' => 'inputdatefilter',
'name' => 'created_at',
@@ -102,9 +101,9 @@ public function getSearchArr()
*/
public function getTableFieldArr()
{
$brandCategorys = Yii::$service->product->brandcategory->getBrandCategoryIdAndNames();
$brandCategorys = Yii::$service->product->brandcategory->getBrandCategoryIdAndNames();
$brandStatus = Yii::$service->product->brandcategory->getStatusArr();

$table_th_bar = [
[
'orderField' => $this->_primaryKey,
@@ -140,16 +139,16 @@ public function getTableFieldArr()
'width' => '110',
'align' => 'center',
],

[
'orderField' => 'status',
'label' => Yii::$service->page->translate->__('Status'),
'width' => '50',
'align' => 'center',
'display' => $brandStatus,
],


[
'orderField' => 'created_at',
'label' => Yii::$service->page->translate->__('Created At'),
@@ -168,9 +167,9 @@ public function getTableFieldArr()

return $table_th_bar;
}



public function getTableTbodyHtml($data)
{
$fields = $this->getTableFieldArr();
@@ -250,6 +249,6 @@ public function getTableTbodyHtml($data)

return $str;
}


}
Loading